Merge branch 'main' into ascii-lower-upper-word

Author: ptweezy

.github/CODEOWNERS

@@ -172,8 +172,12 @@ Lib/_osx_support.py           @python/macos-team
 Lib/test/test__osx_support.py @python/macos-team
 
 # WebAssembly (Emscripten)
-Platforms/emscripten          @freakboy3742 @emmatyping
-Tools/wasm/emscripten         @freakboy3742 @emmatyping
+Platforms/emscripten          @freakboy3742 @emmatyping @hoodmane
+Tools/wasm/emscripten         @freakboy3742 @emmatyping @hoodmane
+Python/wasm_trampoline.c      @hoodmane
+Python/emscripten_signal.c    @hoodmane
+Python/emscripten_syscalls.c  @hoodmane
+.github/workflows/reusable-emscripten.yml @hoodmane
 
 # WebAssembly (WASI)
 Platforms/WASI                @brettcannon @emmatyping @savannahostrowski

Lib/pydoc.py

@@ -2012,7 +2012,6 @@ class Helper:
         ':=': 'ASSIGNMENTEXPRESSIONS',
         '_': 'PRIVATENAMES',
         '__': 'PRIVATENAMES SPECIALMETHODS',
-        '`': 'BACKQUOTES',
         '(': 'TUPLES FUNCTIONS CALLS',
         ')': 'TUPLES FUNCTIONS CALLS',
         '[': 'LISTS SUBSCRIPTS SLICINGS',

Lib/tarfile.py

@@ -1628,6 +1628,8 @@ def _proc_pax(self, tarfile):
         except HeaderError as e:
             raise SubsequentHeaderError(str(e)) from None
 
+        data_offset = next.offset_data
+
         # Process GNU sparse information.
         if "GNU.sparse.map" in pax_headers:
             # GNU extended sparse format version 0.1.
@@ -1649,7 +1651,7 @@ def _proc_pax(self, tarfile):
                 # If the extended header replaces the size field,
                 # we need to recalculate the offset where the next
                 # header starts.
-                offset = next.offset + BLOCKSIZE
+                offset = data_offset
                 if next.isreg() or next.type not in SUPPORTED_TYPES:
                     try:
                         size = PAX_NUMBER_FIELDS["size"](pax_headers["size"])

Lib/test/test_bytes.py

@@ -2098,6 +2098,22 @@ def g():
         alloc = b.__alloc__()
         self.assertGreater(alloc, len(b))
 
+    def test_init_from_iterator_with_offset(self):
+        # gh-158928: Inserting from an iterator in __init__ needs to take into
+        # account if there is a start offset.
+        b = bytearray()
+        def iterator_which_resets():
+            # __init__ reset ob_start. Make it an offset inside by allocating
+            # then doing fast prefix delete.
+            nonlocal b
+            b.resize(200)
+            del b[:100]
+            # Fill remaining already allocated space
+            yield from b'A' * 100
+        # Fill to end. Used to land out of bounds and crash.
+        b.__init__(iterator_which_resets())
+        self.assertEqual(b, bytes(100) + b'A' * 100)
+
     def test_extend(self):
         orig = b'hello'
         a = bytearray(orig)

Lib/test/test_pydoc/test_pydoc.py

@@ -2294,6 +2294,14 @@ def test_keywords(self):
         self.assertEqual(sorted(pydoc.Helper.keywords),
                          sorted(keyword.kwlist + ['case', 'match', 'lazy']))
 
+    def test_symbols(self):
+        # gh-161414
+        for symbol in pydoc.Helper.symbols:
+            with self.subTest(symbol=symbol):
+                buf = StringIO()
+                pydoc.Helper(output=buf).showsymbol(symbol)
+                self.assertNotIn('no documentation found', buf.getvalue())
+
     def test_interact_empty_line_continues(self):
         # gh-138568: test pressing Enter without input should continue in help session
         self.assertEqual(

Lib/test/test_tarfile.py

@@ -1511,6 +1511,34 @@ def test_sparse_file_10_pax_size(self):
             self.assertEqual(tar.getnames(), ["sparse", "last"])
             self.assertEqual(tar.extractfile("last").read(), data)
 
+    def test_pax_size_with_gnu_longname(self):
+        # gh-159435: a GNU long-name header between a pax header and its
+        # member must not make the member header get read a second time.
+        long_name = "long-name-" * 12 + "file.txt"
+
+        def header(name, type, size):
+            info = tarfile.TarInfo(name)
+            info.type = type
+            info.size = size
+            return info.tobuf(tarfile.USTAR_FORMAT)
+
+        def padded(data):
+            return data + b"\0" * (-len(data) % tarfile.BLOCKSIZE)
+
+        pax_record = b"9 size=5\n"
+        buf = header("././@PaxHeader", tarfile.XHDTYPE, len(pax_record))
+        buf += padded(pax_record)
+        longname = long_name.encode() + b"\0"
+        buf += header("././@LongLink", tarfile.GNUTYPE_LONGNAME, len(longname))
+        buf += padded(longname)
+        buf += header("member-short", tarfile.REGTYPE, 5) + padded(b"hello")
+        buf += header("next.txt", tarfile.REGTYPE, 3) + padded(b"bye")
+        buf += b"\0" * (tarfile.BLOCKSIZE * 2)
+
+        with tarfile.open(fileobj=io.BytesIO(buf)) as tar:
+            self.assertEqual(tar.getnames(), [long_name, "next.txt"])
+            self.assertEqual(tar.extractfile("next.txt").read(), b"bye")
+
     @staticmethod
     def _fs_supports_holes():
         # Return True if the platform knows the st_blocks stat attribute and

Misc/NEWS.d/next/Library/2026-10-16-13-00-00.gh-issue-159435.OMNI.rst

@@ -0,0 +1,3 @@
+Fix an offset calculation in :mod:`tarfile` when a PAX header with a ``size``
+record is followed by a GNU long-name header.  Such archives could duplicate or
+skip members while being read.

Misc/NEWS.d/next/Library/2026-11-05-11-59-58.gh-issue-161414.Xnxe8A.rst

@@ -0,0 +1,2 @@
+Remove the backquote from the symbols listed by :func:`help`, asking for help on it reported that no
+documentation was found.

Misc/NEWS.d/next/Security/2026-10-06-12-30-00.gh-issue-158928.Zd9Ybv.rst

@@ -0,0 +1,2 @@
+Fix a buffer overflow when initializing a :class:`bytearray` from an
+iterator.

Objects/bytearrayobject.c

@@ -1156,17 +1156,26 @@ bytearray___init___impl(PyByteArrayObject *self, PyObject *arg,
         /* Interpret it as an int (__index__) */
         rc = _getbytevalue(item, &value);
         Py_DECREF(item);
-        if (!rc)
+        if (!rc) {
             goto error;
+        }
+
+        /* Append the byte.
 
-        /* Append the byte */
-        if (Py_SIZE(self) + 1 < self->ob_alloc) {
+           gh-158928: Iterators are arbitrary code which could modify the
+           bytearray so this must re-calculate if there is enough space(). */
+        Py_ssize_t needed =
+            self->ob_start - self->ob_bytes + Py_SIZE(self) + 1;
+        if (needed < self->ob_alloc) {
             Py_SET_SIZE(self, Py_SIZE(self) + 1);
             bytearray_write_trailing_null_byte(self);
         }
-        else if (PyByteArray_Resize((PyObject *)self, Py_SIZE(self)+1) < 0)
+        else if (PyByteArray_Resize((PyObject *)self, Py_SIZE(self)+1) < 0) {
             goto error;
+        }
         PyByteArray_AS_STRING(self)[Py_SIZE(self)-1] = value;
+        assert(self->ob_start - self->ob_bytes + Py_SIZE(self) <=
+               self->ob_alloc);
     }
 
     /* Clean up and return success */