Merge branch 'main' into gh-1288440-try-incref

Author: colesbury

Doc/library/errno.rst

@@ -672,6 +672,171 @@ defined by the module.  The specific list of defined symbols is available as
 
    .. versionadded:: 3.11
 
+
+.. data:: ENOMEDIUM
+
+   No medium found
+
+
+.. data:: EMEDIUMTYPE
+
+   Wrong medium type
+
+
+.. data:: ENOKEY
+
+   Required key not available
+
+
+.. data:: EKEYEXPIRED
+
+   Key has expired
+
+
+.. data:: EKEYREVOKED
+
+   Key has been revoked
+
+
+.. data:: EKEYREJECTED
+
+   Key was rejected by service
+
+
+.. data:: ERFKILL
+
+   Operation not possible due to RF-kill
+
+
+.. data:: ELOCKUNMAPPED
+
+   Locked lock was unmapped
+
+
+.. data:: ENOTACTIVE
+
+   Facility is not active
+
+
+.. data:: EAUTH
+
+   Authentication error
+
+   .. versionadded:: 3.2
+
+
+.. data:: EBADARCH
+
+   Bad CPU type in executable
+
+   .. versionadded:: 3.2
+
+
+.. data:: EBADEXEC
+
+   Bad executable (or shared library)
+
+   .. versionadded:: 3.2
+
+
+.. data:: EBADMACHO
+
+   Malformed Mach-o file
+
+   .. versionadded:: 3.2
+
+
+.. data:: EDEVERR
+
+   Device error
+
+   .. versionadded:: 3.2
+
+
+.. data:: EFTYPE
+
+   Inappropriate file type or format
+
+   .. versionadded:: 3.2
+
+
+.. data:: ENEEDAUTH
+
+   Need authenticator
+
+   .. versionadded:: 3.2
+
+
+.. data:: ENOATTR
+
+   Attribute not found
+
+   .. versionadded:: 3.2
+
+
+.. data:: ENOPOLICY
+
+   Policy not found
+
+   .. versionadded:: 3.2
+
+
+.. data:: EPROCLIM
+
+   Too many processes
+
+   .. versionadded:: 3.2
+
+
+.. data:: EPROCUNAVAIL
+
+   Bad procedure for program
+
+   .. versionadded:: 3.2
+
+
+.. data:: EPROGMISMATCH
+
+   Program version wrong
+
+   .. versionadded:: 3.2
+
+
+.. data:: EPROGUNAVAIL
+
+   RPC prog. not avail
+
+   .. versionadded:: 3.2
+
+
+.. data:: EPWROFF
+
+   Device power is off
+
+   .. versionadded:: 3.2
+
+
+.. data:: EBADRPC
+
+   RPC struct is bad
+
+   .. versionadded:: 3.2
+
+
+.. data:: ERPCMISMATCH
+
+   RPC version wrong
+
+   .. versionadded:: 3.2
+
+
+.. data:: ESHLIBVERS
+
+   Shared library version mismatch
+
+   .. versionadded:: 3.2
+
+
 .. data:: ENOTCAPABLE
 
    Capabilities insufficient. This error is mapped to the exception

Include/internal/pycore_frame.h

@@ -69,11 +69,11 @@ typedef struct _PyInterpreterFrame {
     PyObject *f_locals; /* Strong reference, may be NULL. Only valid if not on C stack */
     PyFrameObject *frame_obj; /* Strong reference, may be NULL. Only valid if not on C stack */
     _Py_CODEUNIT *instr_ptr; /* Instruction currently executing (or about to begin) */
+    _PyStackRef *stackpointer;
 #ifdef Py_GIL_DISABLED
     /* Index of thread-local bytecode containing instr_ptr. */
     int32_t tlbc_index;
 #endif
-    _PyStackRef *stackpointer;
     uint16_t return_offset;  /* Only relevant during a function call */
     char owner;
 #ifdef Py_DEBUG

Lib/_pyio.py

@@ -1692,13 +1692,14 @@ def readall(self):
 
         return bytes(result)
 
-    def readinto(self, b):
+    def readinto(self, buffer):
         """Same as RawIOBase.readinto()."""
-        m = memoryview(b).cast('B')
-        data = self.read(len(m))
-        n = len(data)
-        m[:n] = data
-        return n
+        self._checkClosed()
+        self._checkReadable()
+        try:
+            return os.readinto(self._fd, buffer)
+        except BlockingIOError:
+            return None
 
     def write(self, b):
         """Write bytes b to file, return number written.

Lib/http/__init__.py

@@ -190,7 +190,7 @@ class HTTPMethod:
 
     Methods from the following RFCs are all observed:
 
-        * RFF 9110: HTTP Semantics, obsoletes 7231, which obsoleted 2616
+        * RFC 9110: HTTP Semantics, obsoletes 7231, which obsoleted 2616
         * RFC 5789: PATCH Method for HTTP
     """
     def __new__(cls, value, description):

Lib/http/client.py

@@ -472,7 +472,7 @@ def read(self, amt=None):
         if self.chunked:
             return self._read_chunked(amt)
 
-        if amt is not None:
+        if amt is not None and amt >= 0:
             if self.length is not None and amt > self.length:
                 # clip the read to the "end of response"
                 amt = self.length
@@ -590,6 +590,8 @@ def _get_chunk_left(self):
 
     def _read_chunked(self, amt=None):
         assert self.chunked != _UNKNOWN
+        if amt is not None and amt < 0:
+            amt = None
         value = []
         try:
             while (chunk_left := self._get_chunk_left()) is not None: