Merge branch 'main' into ali/faulthandler-code-metadata

Author: Alishahryar1

Doc/conf.py

@@ -469,6 +469,10 @@
 # https://github.com/sphinx-doc/sphinx/issues/12359
 epub_use_index = False
 
+# The default depth of 3 lists over a thousand entries, which makes the
+# table of contents hard to navigate in e-book readers
+epub_tocdepth = 2
+
 # translation tag
 # ---------------
 

Doc/library/dis.rst

@@ -1899,32 +1899,38 @@ iterations of the loop.
 
    The operand determines which intrinsic function is called:
 
-   +------------------------------------------+-----------------------------------+
-   | Operand                                  | Description                       |
-   +==========================================+===================================+
-   | ``INTRINSIC_2_INVALID``                  | Not valid                         |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_PREP_RERAISE_STAR``          | Calculates the                    |
-   |                                          | :exc:`ExceptionGroup` to raise    |
-   |                                          | from a ``try-except*``.           |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_TYPEVAR_WITH_BOUND``         | Creates a :class:`typing.TypeVar` |
-   |                                          | with a bound.                     |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_TYPEVAR_WITH_CONSTRAINTS``   | Creates a                         |
-   |                                          | :class:`typing.TypeVar` with      |
-   |                                          | constraints.                      |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_SET_FUNCTION_TYPE_PARAMS``   | Sets the ``__type_params__``      |
-   |                                          | attribute of a function.          |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_ADD_CONDITIONAL_ANNOTATION`` | Adds an annotation index to the   |
-   |                                          | ``__conditional_annotations__``   |
-   |                                          | set.                              |
-   +------------------------------------------+-----------------------------------+
+   +------------------------------------------+-----------------------------------------+
+   | Operand                                  | Description                             |
+   +==========================================+=========================================+
+   | ``INTRINSIC_2_INVALID``                  | Not valid                               |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_PREP_RERAISE_STAR``          | Calculates the                          |
+   |                                          | :exc:`ExceptionGroup` to raise          |
+   |                                          | from a ``try-except*``.                 |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_TYPEVAR_WITH_BOUND``         | Creates a :class:`typing.TypeVar`       |
+   |                                          | with a bound.                           |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_TYPEVAR_WITH_CONSTRAINTS``   | Creates a                               |
+   |                                          | :class:`typing.TypeVar` with            |
+   |                                          | constraints.                            |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_SET_FUNCTION_TYPE_PARAMS``   | Sets the ``__type_params__``            |
+   |                                          | attribute of a function.                |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_ADD_CONDITIONAL_ANNOTATION`` | Adds an annotation index to the         |
+   |                                          | ``__conditional_annotations__``         |
+   |                                          | set.                                    |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_MATCH_CLASS_ISINSTANCE``     | Do :func:`isinstance` checks for        |
+   |                                          | :ref:`Class patterns <class-patterns>`. |
+   +------------------------------------------+-----------------------------------------+
 
    .. versionadded:: 3.12
 
+   .. versionchanged:: 3.16
+      Added ``INTRINSIC_MATCH_CLASS_ISINSTANCE``.
+
 
 .. opcode:: LOAD_SPECIAL
 

Doc/library/optparse.rst

@@ -16,15 +16,12 @@ Choosing an argument parsing library
 The standard library includes three argument parsing libraries:
 
 * :mod:`getopt`: a module that closely mirrors the procedural C ``getopt`` API.
-  Included in the standard library since before the initial Python 1.0 release.
 * :mod:`!optparse`: a declarative replacement for ``getopt`` that
   provides equivalent functionality without requiring each application
-  to implement its own procedural option parsing logic. Included
-  in the standard library since the Python 2.3 release.
+  to implement its own procedural option parsing logic.
 * :mod:`argparse`: a more opinionated alternative to ``optparse`` that
   provides more functionality by default, at the expense of reduced application
-  flexibility in controlling exactly how arguments are processed. Included in
-  the standard library since the Python 2.7 and Python 3.2 releases.
+  flexibility in controlling exactly how arguments are processed.
 
 In the absence of more specific argument parsing design constraints, :mod:`argparse`
 is the recommended choice for implementing command line applications, as it offers

Include/internal/pycore_intrinsics.h

@@ -31,8 +31,9 @@
 #define INTRINSIC_SET_FUNCTION_TYPE_PARAMS       4
 #define INTRINSIC_SET_TYPEPARAM_DEFAULT          5
 #define INTRINSIC_ADD_CONDITIONAL_ANNOTATION     6
+#define INTRINSIC_MATCH_CLASS_ISINSTANCE         7
 
-#define MAX_INTRINSIC_2                          6
+#define MAX_INTRINSIC_2                          7
 
 typedef PyObject *(*intrinsic_func1)(PyThreadState* tstate, PyObject *value);
 typedef PyObject *(*intrinsic_func2)(PyThreadState* tstate, PyObject *value1, PyObject *value2);

Lib/_ast_unparse.py

@@ -925,7 +925,11 @@ def visit_Attribute(self, node):
         # Special case: 3.__abs__() is a syntax error, so if node.value
         # is an integer literal then we need to either parenthesize
         # it or add an extra space to get 3 .__abs__().
-        if isinstance(node.value, Constant) and isinstance(node.value.value, int):
+        # bool is a subclass of int, but True.real and False.real are
+        # valid without a space.
+        if (isinstance(node.value, Constant)
+                and isinstance(node.value.value, int)
+                and not isinstance(node.value.value, bool)):
             self.write(" ")
         self.write(".")
         self.write(node.attr)

Lib/optparse.py

@@ -1,12 +1,5 @@
 """A powerful, extensible, and easy-to-use option parser.
 
-By Greg Ward <gward@python.net>
-
-Originally distributed as Optik.
-
-For support, use the optik-users@lists.sourceforge.net mailing list
-(http://lists.sourceforge.net/lists/listinfo/optik-users).
-
 Simple usage example:
 
    from optparse import OptionParser

Lib/test/lazy_imports_all_exclude.txt

@@ -35,6 +35,5 @@ test_pyrepl
 test_subprocess
 test_symtable
 test_tools
-test_trace
 test_type_annotations
 test_unittest

Lib/test/test_capi/test_opt.py

@@ -5752,12 +5752,13 @@ def testfunc(n):
     def test_match_class(self):
         def testfunc(n):
             class A:
+                __match_args__ = ("val",)
                 val = 1
             x = A()
             ret = 0
             for _ in range(n):
                 match x:
-                    case A():
+                    case A(1):
                         ret += x.val
             return ret
 
@@ -5766,7 +5767,7 @@ class A:
         uops = get_opnames(ex)
 
         self.assertIn("_MATCH_CLASS", uops)
-        self.assertEqual(count_ops(ex, "_POP_TOP_NOP"), 4)
+        self.assertEqual(count_ops(ex, "_POP_TOP_NOP"), 5)
 
     def test_dict_update(self):
         def testfunc(n):

Lib/test/test_cext/__init__.py

@@ -26,6 +26,7 @@
     os.path.join(SOURCE_DIR, 'extension.cpp'),
     os.path.join(SOURCE_DIR, 'setup.py'),
 ]
+RUNTESTS_PY = os.path.join(SOURCE_DIR, 'runtests.py')
 MSVC = support.MS_WINDOWS
 
 
@@ -99,21 +100,10 @@ def run_cmd(operation, cmd):
             cmd.append('-v')
         run_cmd('Install', cmd)
 
-        # Do a reference run. Until we test that running python
-        # doesn't leak references (gh-94755), run it so one can manually check
-        # -X showrefcount results against this baseline.
-        cmd = [python_exe,
-               '-X', 'dev',
-               '-X', 'showrefcount',
-               '-c', 'pass']
-        run_cmd('Reference run', cmd)
-
-        # Import the C/C++ extension
-        cmd = [python_exe,
-               '-X', 'dev',
-               '-X', 'showrefcount',
-               '-c', f"import {extension_name}"]
-        run_cmd('Import', cmd)
+        # Import the extension module and run tests.
+        # On a debug build, check also for reference leaks.
+        cmd = [python_exe, '-X', 'dev', RUNTESTS_PY, extension_name]
+        run_cmd('Tests', cmd)
 
 
 class TestPublicC(BaseTests, unittest.TestCase):

Lib/test/test_cext/extension.c

@@ -264,8 +264,11 @@ class VirtualPyObject : public PyObject {
 public:
     VirtualPyObject();
     virtual ~VirtualPyObject() {
+        PyTypeObject *type = Py_TYPE(this);
         delete [] internal_data;
         --instance_count;
+        // Do not call type->tp_free(this), C++ manages the memory
+        Py_DECREF(type);
     }
     virtual void set_internal_data() {
         internal_data[0] = 1;
@@ -295,7 +298,7 @@ _Py_COMP_DIAG_PUSH
 #endif
 
 PyType_Slot VirtualPyObject_Slots[] = {
-    {Py_tp_free, (void*)VirtualPyObject::dealloc},
+    {Py_tp_dealloc, (void*)VirtualPyObject::dealloc},
     {0, _Py_NULL},
 };
 
@@ -333,6 +336,10 @@ test_virtual_object(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
             "instance_count should be 0, got %d",
             VirtualPyObject::instance_count);
     }
+
+    // Force a garbage collection to delete the temporary heap type
+    // used by this test
+    PyGC_Collect();
     Py_RETURN_NONE;
 }
 #endif  // __cplusplus && !Py_TARGET_ABI3T
@@ -356,8 +363,6 @@ static PyMethodDef module_methods[] = {
 static int
 module_exec(PyObject *module)
 {
-    PyObject *result;
-
 #ifdef __STDC_VERSION__
     if (PyModule_AddIntMacro(module, __STDC_VERSION__) < 0) {
         return -1;
@@ -368,31 +373,13 @@ module_exec(PyObject *module)
         return -1;
     }
 #endif
-
-    result = PyObject_CallMethod(module, "test_macros", "");
-    if (!result) return -1;
-    Py_DECREF(result);
-
-    result = PyObject_CallMethod(module, "test_datetime", "");
-    if (!result) return -1;
-    Py_DECREF(result);
-
-    result = PyObject_CallMethod(module, "test_unicode", "");
-    if (!result) return -1;
-    Py_DECREF(result);
-
-#ifdef __cplusplus
-    result = PyObject_CallMethod(module, "test_api_casts", "");
-    if (!result) return -1;
-    Py_DECREF(result);
-#endif
-
-#if defined(__cplusplus) && !defined(Py_TARGET_ABI3T)
-    result = PyObject_CallMethod(module, "test_virtual_object", "");
-    if (!result) return -1;
-    Py_DECREF(result);
+#ifdef _MSVC_LANG
+    if (PyModule_AddIntMacro(module, _MSVC_LANG) < 0) {
+        return -1;
+    }
 #endif
-
+    // Ignore "unused argument" warning when none of these macros is defined
+    (void)module;
     return 0;
 }