Merge branch 'main' into tvobject

JelleZijlstra · web-flow · commit d5b86c57855a · 2023-04-26T08:51:16.000-07:00
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
@@ -1571,7 +1571,7 @@ Server objects are created by :meth:`loop.create_server`,
 :meth:`loop.create_unix_server`, :func:`start_server`,
 and :func:`start_unix_server` functions.
 
-Do not instantiate the class directly.
+Do not instantiate the :class:`Server` class directly.
 
 .. class:: Server
 
@@ -1662,7 +1662,8 @@ Do not instantiate the class directly.
 
    .. attribute:: sockets
 
-      List of :class:`socket.socket` objects the server is listening on.
+      List of socket-like objects, ``asyncio.trsock.TransportSocket``, which
+      the server is listening on.
 
       .. versionchanged:: 3.7
          Prior to Python 3.7 ``Server.sockets`` used to return an
diff --git a/Python/specialize.c b/Python/specialize.c
@@ -544,8 +544,10 @@ _Py_Specialize_LoadSuperAttr(PyObject *global_super, PyObject *class, PyObject *
         write_u32(cache->self_type_version, Py_TYPE(self)->tp_version_tag);
         write_obj(cache->method, res);  // borrowed
         instr->op.code = LOAD_SUPER_ATTR_METHOD;
+        Py_DECREF(res);
         goto success;
     }
+    Py_DECREF(res);
     SPECIALIZATION_FAIL(LOAD_SUPER_ATTR, SPEC_FAIL_SUPER_NOT_METHOD);
 
 fail:
diff --git a/Tools/build/deepfreeze.py b/Tools/build/deepfreeze.py
@@ -175,6 +175,12 @@ def generate_unicode(self, name: str, s: str) -> str:
             return f"&_Py_STR({strings[s]})"
         if s in identifiers:
             return f"&_Py_ID({s})"
+        if len(s) == 1:
+            c = ord(s)
+            if c < 128:
+                return f"(PyObject *)&_Py_SINGLETON(strings).ascii[{c}]"
+            elif c < 256:
+                return f"(PyObject *)&_Py_SINGLETON(strings).latin1[{c - 128}]"
         if re.match(r'\A[A-Za-z0-9_]+\Z', s):
             name = f"const_str_{s}"
         kind, ascii = analyze_character_width(s)
