Cython 3.2.2__tar.gz → 3.2.4__tar.gz

cython-3.2.4/.gitrev

@@ -0,0 +1 @@
+21bda420d583bcf464fb9efb932b09c5f3db1efd

{cython-3.2.2 → cython-3.2.4}/CHANGES.rst

@@ -2,6 +2,72 @@
 Cython Changelog
 ================
 
+3.2.4 (2026-01-04)
+==================
+
+Features added
+--------------
+
+* In preparation of Cython 3.3, a new decorator ``@collection_type(tname)`` can be used
+  to advertise an extension type as being a ``'sequence'`` or ``'mapping'``.  This currently
+  only has the effect of setting the ``Py_TPFLAGS_SEQUENCE`` flag on the type or not, but
+  is provided for convenience to allow using the new decorator already in Cython 3.2 code.
+
+* Several C++ exception declarations were added to ``libcpp.exceptions``.
+  (Github issue :issue:`7389`)
+
+Bugs fixed
+----------
+
+* Pseudo-literal default values of function arguments like ``arg=str()`` could generate
+  invalid C code when internally converted into a real literal.
+  (Github issue :issue:`6192`)
+
+* The pickle serialisation of extension types using the ``auto_pickle`` feature was
+  larger than necessary since 3.2.0 for types without Python object attributes.
+  It is now back to the state before 3.2.0 again.
+  (Github issue :issue:`7443`)
+
+* Constants are now only made immortal on freethreading Python if they are not shared.
+  (Github issue :issue:`7439`)
+
+* ``PyDict_SetDefaultRef()`` is now used when available to avoid temporary borrowed references.
+  (Github issue :issue:`7347`)
+
+* Includes all fixes as of Cython 3.1.8.
+
+
+3.2.3 (2025-12-14)
+==================
+
+Features added
+--------------
+
+* The C-API declarations were updated to include the new ``PyList_*()`` functions.
+  (Github issue :issue:`7291`)
+
+* The ``Py_mod_gil`` module setting can now be changed with a C macro, overriding
+  the ``freethreading_compatible`` directive setting.
+  (Github issue :issue:`7404`)
+
+Bugs fixed
+----------
+
+* t-strings lost the last element when compiled for the Limited API.
+  (Github issue :issue:`7381`)
+
+* The ``array.data`` property of the ``cpython.array`` declarations generated a
+  useless exception check that degraded its use in ``nogil`` code.
+  (Github issue :issue:`7408`)
+
+* Parallel builds with the ``cythonize`` command could request more processes
+  than allowed by the platform, thus failing the build.
+  (Github issue :issue:`7384`)
+
+* A minor thread sanitizer issue was resolved.
+  (Github issue :issue:`7383`)
+
+
 3.2.2 (2025-11-30)
 ==================
 
@@ -560,12 +626,16 @@ Other changes
   (Github issue :issue:`6423`)
 
 
-3.1.8 (2025-??-??)
+3.1.8 (2026-01-03)
 ==================
 
 Bugs fixed
 ----------
 
+* Assignment expressions used in comprehensions could look at the wrong scope,
+  thus using different variables and different data.
+  (Github issue :issue:`6547`)
+
 * Some internal C symbols were not declared as ``static``, preventing static linking
   of multiple modules.
   Patch by Yury Popov.  (Github issue :issue:`7310`)

{cython-3.2.2 → cython-3.2.4}/Cython/Build/Cythonize.py

@@ -12,10 +12,8 @@ from ..Compiler import Options
 
 try:
     import multiprocessing
-    parallel_compiles = int(multiprocessing.cpu_count() * 1.5)
 except ImportError:
     multiprocessing = None
-    parallel_compiles = 0
 
 
 def find_package_base(path):
@@ -85,7 +83,8 @@ def _build(ext_modules, parallel):
     if not modcount:
         return
 
-    serial_execution_mode = modcount == 1 or parallel < 2
+    serial_execution_mode = modcount == 1 or (
+        parallel is not None and parallel < 2)
 
     try:
         pool_cm = (
@@ -248,8 +247,8 @@ Environment variables:
                       help="use CODESTRING as pre-benchmark setup code for --bench")
 
     parser.add_argument('-j', '--parallel', dest='parallel', metavar='N',
-                      type=int, default=parallel_compiles,
-                      help=f'run builds in N parallel jobs (default: {parallel_compiles or 1})')
+                      type=int, default=None,
+                      help='run builds in N parallel jobs (default: CPU count)')
     parser.add_argument('-f', '--force', dest='force', action='store_true', default=None,
                       help='force recompilation')
     parser.add_argument('-q', '--quiet', dest='quiet', action='store_true', default=None,

{cython-3.2.2 → cython-3.2.4}/Cython/Build/Tests/TestCythonizeArgsParser.py

@@ -1,6 +1,5 @@
 from Cython.Build.Cythonize import (
     create_args_parser, parse_args_raw, parse_args,
-    parallel_compiles
 )
 
 from Cython.Compiler import Options
@@ -22,7 +21,9 @@ class TestCythonizeArgsParser(TestCase):
     def are_default(self, options, skip):
         # empty containers
         empty_containers = ['directives', 'compile_time_env', 'options', 'excludes']
-        are_none = ['language_level', 'annotate', 'build', 'build_inplace', 'force', 'quiet', 'lenient', 'keep_going', 'no_docstrings']
+        are_none = [
+            'language_level', 'annotate', 'build', 'build_inplace', 'force', 'quiet', 'lenient', 'keep_going', 'no_docstrings', 'parallel'
+        ]
         for opt_name in empty_containers:
             if len(getattr(options, opt_name))!=0 and (opt_name not in skip):
                 self.assertEqual(opt_name,"", msg="For option "+opt_name)
@@ -31,8 +32,6 @@ class TestCythonizeArgsParser(TestCase):
             if (getattr(options, opt_name) is not None) and (opt_name not in skip):
                 self.assertEqual(opt_name,"", msg="For option "+opt_name)
                 return False
-        if options.parallel!=parallel_compiles and ('parallel' not in skip):
-            return False
         return True
 
     # testing directives:

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/Code.py

@@ -2422,7 +2422,17 @@ class GlobalState:
         writer.putln(f"PyObject **table = {array_cname};")
         writer.putln(f"for (Py_ssize_t i=0; i<{constant_count}; ++i) {{")
         writer.putln("#if CYTHON_COMPILING_IN_CPYTHON_FREETHREADING")
+        # We don't want to set the refcount on shared constants (e.g. cached integers)
+        # because setting the refcount isn't thread-safe. The chances are that most of the constants
+        # that this applies to are already immortal though so that isn't a great loss.
+        writer.putln("#if PY_VERSION_HEX < 0x030E0000")
+        writer.putln("if (_Py_IsOwnedByCurrentThread(table[i]) && Py_REFCNT(table[i]) == 1)")
+        writer.putln("#else")
+        writer.putln("if (PyUnstable_Object_IsUniquelyReferenced(table[i]))")
+        writer.putln("#endif")
+        writer.putln("{")
         writer.putln("Py_SET_REFCNT(table[i], _Py_IMMORTAL_REFCNT_LOCAL);")
+        writer.putln("}")
         writer.putln("#else")
         writer.putln("Py_SET_REFCNT(table[i], _Py_IMMORTAL_INITIAL_REFCNT);")
         writer.putln("#endif")

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/ExprNodes.py

@@ -10491,8 +10491,8 @@ class PyCFunctionNode(ExprNode, ModuleNameMixin):
             defaults = '__Pyx_CyFunction_Defaults(struct %s, %s)' % (
                 self.defaults_entry.type.objstruct_cname, self.result())
             for arg, entry in self.defaults:
-                arg.generate_assignment_code(code, target='%s->%s' % (
-                    defaults, entry.cname))
+                if arg.is_dynamic:
+                    arg.generate_assignment_code(code, cyfunc_struct_target=f'{defaults}->{entry.cname}')
 
         if self.defaults_tuple:
             code.putln('__Pyx_CyFunction_SetDefaultsTuple(%s, %s);' % (

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/FlowControl.py

@@ -337,7 +337,8 @@ class NameAssignment:
         self.is_arg = False
         self.is_deletion = False
         self.inferred_type = None
-        # For generator expression targets, the rhs can have a different scope than the lhs.
+        # For generator expression targets in comprehensions (and possibly other things),
+        # the rhs can have a different scope than the lhs.
         self.rhs_scope = rhs_scope
 
     def __repr__(self):
@@ -804,7 +805,7 @@ class ControlFlowAnalysis(CythonTransform):
                 entry = self.env.lookup(lhs.name)
             if entry is None:  # TODO: This shouldn't happen...
                 return
-            self.flow.mark_assignment(lhs, rhs, entry, rhs_scope=rhs_scope)
+            self.flow.mark_assignment(lhs, rhs, entry, rhs_scope=(rhs_scope or self.env))
         elif lhs.is_sequence_constructor:
             for i, arg in enumerate(lhs.args):
                 if arg.is_starred:

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/ModuleNode.py

@@ -979,6 +979,17 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
             code.putln("#endif")
             code.putln("")
 
+        code.putln("#ifdef CYTHON_FREETHREADING_COMPATIBLE")
+        code.putln("#if CYTHON_FREETHREADING_COMPATIBLE")
+        code.putln("#define __Pyx_FREETHREADING_COMPATIBLE Py_MOD_GIL_NOT_USED")
+        code.putln("#else")
+        code.putln("#define __Pyx_FREETHREADING_COMPATIBLE Py_MOD_GIL_USED")
+        code.putln("#endif")
+        code.putln("#else")
+        ft_compatible = "Py_MOD_GIL_NOT_USED" if env.directives["freethreading_compatible"] else "Py_MOD_GIL_USED"
+        code.putln(f"#define __Pyx_FREETHREADING_COMPATIBLE {ft_compatible}")
+        code.putln("#endif")
+
         c_string_type = env.directives['c_string_type']
         c_string_encoding = env.directives['c_string_encoding']
         if c_string_type not in ('bytes', 'bytearray') and not c_string_encoding:
@@ -3628,10 +3639,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         code.putln("{Py_mod_create, (void*)%s}," % Naming.pymodule_create_func_cname)
         code.putln("{Py_mod_exec, (void*)%s}," % exec_func_cname)
         code.putln("#if CYTHON_COMPILING_IN_CPYTHON_FREETHREADING")
-        gil_option = ("Py_MOD_GIL_NOT_USED"
-                      if env.directives["freethreading_compatible"]
-                      else "Py_MOD_GIL_USED")
-        code.putln("{Py_mod_gil, %s}," % gil_option)
+        code.putln("{Py_mod_gil, __Pyx_FREETHREADING_COMPATIBLE},")
         code.putln("#endif")
         code.putln("#if PY_VERSION_HEX >= 0x030C0000 && CYTHON_USE_MODULE_STATE")
         subinterp_option = {

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/Nodes.py

@@ -1078,12 +1078,14 @@ class CArgDeclNode(Node):
         if self.default:
             self.default.annotate(code)
 
-    def generate_assignment_code(self, code, target=None, overloaded_assignment=False):
+    def generate_assignment_code(self, code, overloaded_assignment=False,
+                                 cyfunc_struct_target=None):
         default = self.default
-        if default is None or default.is_literal:
+        if default is None or (default.is_literal and cyfunc_struct_target is None):
             return
-        if target is None:
-            target = self.calculate_default_value_code(code)
+        # Note that even if self.is_dynamic, default may be a literal if it's been
+        # optimized into a literal after analyse_expressions
+        target = cyfunc_struct_target or self.calculate_default_value_code(code)
         default.generate_evaluation_code(code)
         default.make_owned_reference(code)
         result = default.result() if overloaded_assignment else default.result_as(self.type)

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/Options.py

@@ -357,7 +357,7 @@ directive_types = {
     'auto_pickle': bool,
     'locals': dict,
     'final' : bool,  # final cdef classes and methods
-    'collection_type': one_of('sequence'),
+    'collection_type': one_of('sequence', 'mapping'),
     'nogil' : DEFER_ANALYSIS_OF_ARGUMENTS,
     'gil' : DEFER_ANALYSIS_OF_ARGUMENTS,
     'critical_section' : DEFER_ANALYSIS_OF_ARGUMENTS,

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/ParseTreeTransforms.py

@@ -1397,6 +1397,8 @@ class InterpretCompilerDirectives(CythonTransform):
                 elif isinstance(old_value, list):
                     old_value.extend(value)
                 else:
+                    if name == "collection_type" and value != optdict[name]:
+                        error(node.pos, "Multiple values of collection_type are not supported")
                     optdict[name] = value
             else:
                 optdict[name] = value
@@ -2323,7 +2325,7 @@ if VALUE is not None:
 
             members = ', '.join(f'self.{v}' for v in all_members_names) + (',' if len(all_members_names) == 1 else '')
             # Even better, we could check PyType_IS_GC.
-            any_notnone_members = ' or '.join([f'self.{e.name} is not None' for e in all_members if e.type.is_pyobject] or ['False']),
+            any_notnone_members = ' or '.join([f'self.{e.name} is not None' for e in all_members if e.type.is_pyobject] or ['False'])
 
             pickle_code = f"""
                 def __reduce_cython__(self):

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/Parsing.py

@@ -550,7 +550,7 @@ def p_trailer(s: PyrexScanner, node1):
 #             star_expr )
 
 @cython.cfunc
-def p_call_parse_args(s: PyrexScanner, allow_genexp: cython.bint = True):
+def p_call_parse_args(s: PyrexScanner, allow_genexp: cython.bint = True) -> tuple:
     # s.sy == '('
     s.next()
     positional_args = []
@@ -699,7 +699,7 @@ def p_subscript_list(s: PyrexScanner) -> tuple:
 #subscript: '.' '.' '.' | test | [test] ':' [test] [':' [test]]
 
 @cython.cfunc
-def p_subscript(s: PyrexScanner):
+def p_subscript(s: PyrexScanner) -> list:
     # Parse a subscript and return a list of
     # 1, 2 or 3 ExprNodes, depending on how
     # many slice elements were encountered.
@@ -731,7 +731,7 @@ def expect_ellipsis(s: PyrexScanner):
 
 
 @cython.cfunc
-def make_slice_nodes(pos, subscripts):
+def make_slice_nodes(pos, subscripts) -> list:
     # Convert a list of subscripts as returned
     # by p_subscript_list into a list of ExprNodes,
     # creating SliceNodes for elements with 2 or
@@ -1041,7 +1041,7 @@ def p_string_literal_shared_read(
     return result
 
 @cython.cfunc
-def _validate_kind_string(pos, systring: str):
+def _validate_kind_string(pos, systring: str) -> str:
     kind_string = systring.rstrip('"\'').lower()
     if len(kind_string) <= 1 or (len(kind_string) == 2 and kind_string in "rbrurfrtr"):
         return kind_string
@@ -1137,7 +1137,7 @@ def p_string_literal(s: PyrexScanner, kind_override=None) -> tuple:
 
 
 @cython.cfunc
-def p_read_ft_string_expression(s: PyrexScanner):
+def p_read_ft_string_expression(s: PyrexScanner) -> str:
     strings = []
     while True:
         s.next()
@@ -1154,7 +1154,7 @@ def p_read_ft_string_expression(s: PyrexScanner):
 @cython.cfunc
 def p_ft_string_replacement_field(s: PyrexScanner,
                                 is_raw: cython.bint, is_single_quoted: cython.bint,
-                                tf_string_kind: cython.Py_UCS4):
+                                tf_string_kind: cython.Py_UCS4) -> list:
     result = []
     conversion_char = format_spec = expr = None
     t_string_expression = None
@@ -1264,7 +1264,7 @@ def p_ft_string_replacement_field(s: PyrexScanner,
 def p_ft_string_middles(s: PyrexScanner,
                         is_raw: cython.bint, is_single_quoted: cython.bint,
                         is_format_string: cython.bint,
-                        tf_string_kind: cython.Py_UCS4):
+                        tf_string_kind: cython.Py_UCS4) -> list:
     middles: list = []
     builder = StringEncoding.UnicodeLiteralBuilder()
     pos = s.position()
@@ -1302,7 +1302,7 @@ def p_ft_string_middles(s: PyrexScanner,
     return middles
 
 @cython.cfunc
-def p_ft_string_literal(s: PyrexScanner):
+def p_ft_string_literal(s: PyrexScanner) -> tuple:
     # s.sy == BEGIN_FT_STRING
     kind_string = _validate_kind_string(s.position(), s.systring)
     tf_string_kind: cython.Py_UCS4 = 't' if 't' in kind_string else 'f'
@@ -1988,7 +1988,7 @@ def p_from_import_statement(s: PyrexScanner, first_statement: cython.bint = 0):
 
 
 @cython.cfunc
-def p_imported_name(s: PyrexScanner):
+def p_imported_name(s: PyrexScanner) -> tuple:
     pos = s.position()
     name = p_ident(s)
     as_name = p_as_name(s)
@@ -2684,7 +2684,7 @@ def p_suite_with_docstring(s: PyrexScanner, ctx, with_doc_only: cython.bint = Fa
 
 
 @cython.cfunc
-def p_positional_and_keyword_args(s: PyrexScanner, end_sy_set, templates = None):
+def p_positional_and_keyword_args(s: PyrexScanner, end_sy_set, templates = None) -> tuple:
     """
     Parses positional and keyword arguments. end_sy_set
     should contain any s.sy that terminate the argument list.
@@ -4713,7 +4713,7 @@ def p_class_pattern(s: PyrexScanner):
 
 
 @cython.cfunc
-def p_keyword_pattern(s: PyrexScanner):
+def p_keyword_pattern(s: PyrexScanner) -> tuple:
     if s.sy != "IDENT":
         s.error("Expected identifier")
     arg = p_name(s, s.systring)

{cython-3.2.2 → cython-3.2.4}/Cython/Compiler/Symtab.py

@@ -1901,12 +1901,6 @@ class ModuleScope(Scope):
         if self.directives.get('final'):
             entry.type.is_final_type = True
         collection_type = self.directives.get('collection_type')
-        if collection_type:
-            from .UtilityCode import NonManglingModuleScope
-            if not isinstance(self, NonManglingModuleScope):
-                # TODO - DW would like to make it public, but I'm making it internal-only
-                # for now to avoid adding new features without consensus
-                error(pos, "'collection_type' is not a public cython directive")
         if collection_type == 'sequence':
             entry.type.has_sequence_flag = True
 

{cython-3.2.2 → cython-3.2.4}/Cython/Includes/cpython/array.pxd

@@ -101,7 +101,7 @@ cdef extern from *:  # Hard-coded utility code hack.
             arraydescr* ob_descr    # struct arraydescr *ob_descr;
 
         @property
-        cdef inline __data_union data(self) nogil:
+        cdef inline __data_union data(self) noexcept nogil:
             return __Pyx_PyArray_Data(self)
 
         def __getbuffer__(self, Py_buffer* info, int flags):
@@ -134,7 +134,7 @@ cdef extern from *:  # Hard-coded utility code hack.
 
     array newarrayobject(PyTypeObject* type, Py_ssize_t size, arraydescr *descr)
 
-    __data_union __Pyx_PyArray_Data(array self) nogil
+    __data_union __Pyx_PyArray_Data(array self) noexcept nogil
     # fast resize/realloc
     # not suitable for small increments; reallocation 'to the point'
     int resize(array self, Py_ssize_t n) except -1

{cython-3.2.2 → cython-3.2.4}/Cython/Includes/cpython/list.pxd

@@ -1,5 +1,38 @@
 from .object cimport PyObject
 
+cdef extern from *:
+    # Backport PyList_GetItemRef, PyList_Extend and PyList_Clear
+    """
+    #if __PYX_LIMITED_VERSION_HEX < 0x030d0000
+    static CYTHON_INLINE PyObject *
+    __Pyx_CAPI_PyList_GetItemRef(PyObject *list, Py_ssize_t index)
+    {
+        PyObject *item = PyList_GetItem(list, index);
+        Py_XINCREF(item);
+        return item;
+    }
+    #else
+    #define __Pyx_CAPI_PyList_GetItemRef PyList_GetItemRef
+    #endif
+
+    #if CYTHON_COMPILING_IN_LIMITED_API || PY_VERSION_HEX < 0x030d0000
+    static CYTHON_INLINE int
+    __Pyx_CAPI_PyList_Extend(PyObject *list, PyObject *iterable)
+    {
+        return PyList_SetSlice(list, PY_SSIZE_T_MAX, PY_SSIZE_T_MAX, iterable);
+    }
+
+    static CYTHON_INLINE int
+    __Pyx_CAPI_PyList_Clear(PyObject *list)
+    {
+        return PyList_SetSlice(list, 0, PY_SSIZE_T_MAX, NULL);
+    }
+    #else
+    #define __Pyx_CAPI_PyList_Extend PyList_Extend
+    #define __Pyx_CAPI_PyList_Clear PyList_Clear
+    #endif
+    """
+
 cdef extern from "Python.h":
 
     ############################################################################
@@ -29,12 +62,17 @@ cdef extern from "Python.h":
     Py_ssize_t PyList_GET_SIZE(object list)
     # Macro form of PyList_Size() without error checking.
 
+    object PyList_GetItemRef "__Pyx_CAPI_PyList_GetItemRef" (object list, Py_ssize_t index)
+    # Return value: New reference.
+    # Return the object at position index in the list pointed to by list.
+    # The position must be non-negative; indexing from the end of the
+    # list is not supported. If index is out of bounds (<0 or >=len(list)),
+    # return NULL and set an IndexError exception.
+
     PyObject* PyList_GetItem(object list, Py_ssize_t index) except NULL
     # Return value: Borrowed reference.
-    # Return the object at position pos in the list pointed to by
-    # p. The position must be positive, indexing from the end of the
-    # list is not supported. If pos is out of bounds, return NULL and
-    # set an IndexError exception.
+    # Like PyList_GetItemRef(), but returns a borrowed reference instead of
+    # a strong reference.
 
     PyObject* PyList_GET_ITEM(object list, Py_ssize_t i)
     # Return value: Borrowed reference.
@@ -78,6 +116,20 @@ cdef extern from "Python.h":
     # may be NULL, indicating the assignment of an empty list (slice
     # deletion). Return 0 on success, -1 on failure.
 
+    int PyList_Extend "__Pyx_CAPI_PyList_Extend" (object list, object iterable) except -1
+    # Extend list with the contents of iterable. This is the same as
+    # PyList_SetSlice(list, PY_SSIZE_T_MAX, PY_SSIZE_T_MAX, iterable)
+    # and analogous to list.extend(iterable) or list += iterable.
+    # Raise an exception and return -1 if list is not a list object.
+    # Return 0 on success.
+
+    int PyList_Clear "__Pyx_CAPI_PyList_Clear" (object list) except -1
+    # Remove all items from list. This is the same as
+    # PyList_SetSlice(list, 0, PY_SSIZE_T_MAX, NULL) and analogous
+    # to list.clear() or del list[:].
+    # Raise an exception and return -1 if list is not a list object.
+    # Return 0 on success.
+
     int PyList_Sort(object list) except -1
     # Sort the items of list in place. Return 0 on success, -1 on
     # failure. This is equivalent to "list.sort()".

{cython-3.2.2 → cython-3.2.4}/Cython/Includes/libcpp/exception.pxd

@@ -6,7 +6,47 @@ cdef extern from "<exception>" namespace "std" nogil:
 
     exception_ptr make_exception_ptr[E](E e) noexcept
     void rethrow_exception(exception_ptr) except +
-    # current_exception skipped because it'll be almost impossible to use from Cython
+    exception_ptr current_exception() noexcept
+
+    cdef cppclass exception:
+        const char* what() noexcept
+
+cdef extern from "<stdexcept>" namespace "std" nogil:
+    # Omitting the constructors of derived exception classes for now.
+    # They can't be stack-allocated easily in Cython because they don't have
+    # a nullary constructor. They also can't be thrown in Cython.
+    # So they're most useful just as class names when implementing
+    # exception handlers.
+    cdef cppclass logic_error(exception):
+        pass
+    cdef cppclass invalid_argument(logic_error):
+        pass
+    cdef cppclass domain_error(logic_error):
+        pass
+    cdef cppclass length_error(logic_error):
+        pass
+    cdef cppclass out_of_range(logic_error):
+        pass
+
+    cdef cppclass runtime_error(exception):
+        pass
+    cdef cppclass range_error(runtime_error):
+        pass
+    cdef cppclass overflow_error(runtime_error):
+        pass
+
+    cdef cppclass bad_typeid(exception):
+        pass
+
+    cdef cppclass bad_cast(exception):
+        pass
+
+    cdef cppclass bad_alloc(exception):
+        pass
+
+    cdef cppclass bad_exception(exception):
+        pass
+
 
 cdef extern from *:
     """

{cython-3.2.2 → cython-3.2.4}/Cython/Shadow.py

@@ -1,7 +1,7 @@
 # cython.* namespace for pure mode.
 
 # Possible version formats: "3.1.0", "3.1.0a1", "3.1.0a1.dev0"
-__version__ = "3.2.2"
+__version__ = "3.2.4"
 
 
 # BEGIN shameless copy from Cython/minivect/minitypes.py
@@ -103,7 +103,7 @@ class _Optimization:
 cclass = ccall = cfunc = _EmptyDecoratorAndManager()
 
 annotation_typing = returns = wraparound = boundscheck = initializedcheck = \
-    nonecheck = embedsignature = cdivision = cdivision_warnings = \
+    nonecheck = embedsignature = cdivision = cdivision_warnings = collection_type = \
     always_allow_keywords = profile = linetrace = infer_types = \
     unraisable_tracebacks = freelist = auto_pickle = cpow = trashcan = \
     auto_cpdef = c_api_binop_methods = \

{cython-3.2.2 → cython-3.2.4}/Cython/Tests/TestShadow.py

@@ -8,9 +8,7 @@ class TestShadow(unittest.TestCase):
         missing_directives = []
         extra_directives = []
         for full_directive in Options.directive_types.keys():
-            # Python 2 doesn't support "directive, *rest = full_directive.split('.')"
-            split_directive = full_directive.split('.')
-            directive, rest = split_directive[0], split_directive[1:]
+            directive, *rest = full_directive.split('.')
 
             scope = Options.directive_scopes.get(full_directive)
             if scope and len(scope) == 1 and scope[0] == "module":
@@ -18,10 +16,6 @@ class TestShadow(unittest.TestCase):
                 if hasattr(Shadow, directive):
                     extra_directives.append(full_directive)
                 continue
-            if full_directive == "collection_type":
-                # collection_type is current restricted to utility code only
-                # so doesn't need to be in Shadow
-                continue
             if full_directive == "staticmethod":
                 # staticmethod is a weird special-case and not really intended to be
                 # used from the cython module

{cython-3.2.2 → cython-3.2.4}/Cython/Utility/Builtins.c

@@ -631,13 +631,13 @@ static CYTHON_INLINE PyObject *__Pyx_PyDict_SetDefault(PyObject *d, PyObject *ke
 
 static CYTHON_INLINE PyObject *__Pyx_PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *default_value) {
     PyObject* value;
-#if CYTHON_COMPILING_IN_LIMITED_API && __PYX_LIMITED_VERSION_HEX >= 0x030C0000
+#if __PYX_LIMITED_VERSION_HEX >= 0x030F0000 || (!CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x030d00A4)
+    PyDict_SetDefaultRef(d, key, default_value, &value);
+#elif CYTHON_COMPILING_IN_LIMITED_API && __PYX_LIMITED_VERSION_HEX >= 0x030C0000
     PyObject *args[] = {d, key, default_value};
     value = PyObject_VectorcallMethod(PYIDENT("setdefault"), args, 3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
 #elif CYTHON_COMPILING_IN_LIMITED_API
     value = PyObject_CallMethodObjArgs(d, PYIDENT("setdefault"), key, default_value, NULL);
-#elif PY_VERSION_HEX >= 0x030d0000
-    PyDict_SetDefaultRef(d, key, default_value, &value);
 #else
     value = PyDict_SetDefault(d, key, default_value);
     if (unlikely(!value)) return NULL;

{cython-3.2.2 → cython-3.2.4}/Cython/Utility/CythonFunction.c

@@ -1572,10 +1572,7 @@ __pyx_err:;
 
     if (likely(unbound_result_func)) {
         if (self->self) {
-            __pyx_FusedFunctionObject *unbound = (__pyx_FusedFunctionObject *) unbound_result_func;
-
-            // TODO: move this to InitClassCell
-            __Pyx_CyFunction_SetClassObj(unbound, __Pyx_CyFunction_GetClassObj(self));
+            assert(__Pyx_CyFunction_GetClassObj(unbound_result_func) == __Pyx_CyFunction_GetClassObj(self));
 
             result_func = __pyx_FusedFunction_descr_get(unbound_result_func,
                                                         self->self, self->self);
@@ -1673,7 +1670,7 @@ __pyx_FusedFunction_call(PyObject *func, PyObject *args, PyObject *kw)
         if (unlikely(!new_func))
             goto bad;
 
-        __Pyx_CyFunction_SetClassObj(new_func, __Pyx_CyFunction_GetClassObj(binding_func));
+        assert(__Pyx_CyFunction_GetClassObj(new_func) == __Pyx_CyFunction_GetClassObj(binding_func));
 
         func = (PyObject *) new_func;
     }

{cython-3.2.2 → cython-3.2.4}/Cython/Utility/StringTools.c

@@ -59,7 +59,7 @@ static PyObject *__Pyx_DecompressString(const char *s, Py_ssize_t length, int al
 //@requires: TypeConversion.c::GCCDiagnostics
 
 static PyObject *__Pyx_DecompressString(const char *s, Py_ssize_t length, int algo) {
-    PyObject *module, *decompress, *compressed_bytes, *decompressed;
+    PyObject *module = NULL, *decompress, *compressed_bytes, *decompressed;
 
     const char* module_name = algo == 3 ? "compression.zstd" : algo == 2 ? "bz2" : "zlib";
 
@@ -69,7 +69,7 @@ static PyObject *__Pyx_DecompressString(const char *s, Py_ssize_t length, int al
     #if __PYX_LIMITED_VERSION_HEX >= 0x030e0000
     if (algo == 3) {
         PyObject *fromlist = Py_BuildValue("[O]", methodname);
-        if (unlikely(!fromlist)) return NULL;
+        if (unlikely(!fromlist)) goto bad;
         module = PyImport_ImportModuleLevel("compression.zstd", NULL, NULL, fromlist, 0);
         Py_DECREF(fromlist);
     } else