Cython 3.0.11__tar.gz → 3.0.12__tar.gz

cython-3.0.12/.gitrev

@@ -0,0 +1 @@
+c7dae70222b36f52945e9723acf72d2bd698b08d

{cython-3.0.11 → cython-3.0.12}/CHANGES.rst

@@ -2,6 +2,35 @@
 Cython Changelog
 ================
 
+3.0.12 (2025-02-11)
+===================
+
+Bugs fixed
+----------
+
+* Release 3.0.11 introduced some incorrect ``noexcept`` warnings.
+  (Github issue :issue:`6335`)
+
+* Conditional assignments to variables using the walrus operator could crash.
+  (Github issue :issue:`6094`)
+
+* Dict assignments to struct members with reserved C names could generate invalid C code.
+
+* Fused ctuples with the same entry types but different sizes could fail to compile.
+  (Github issue :issue:`6328`)
+
+* In Py3, `pyximport` was not searching `sys.path` when looking for importable source files.
+  (Github issue :issue:`5615`)
+
+* Using `& 0` on integers produced with `int.from_bytes()` could read invalid memory on Python 3.10.
+  (Github issue :issue:`6480`)
+
+* Modules could fail to compile in PyPy 3.11 due to missing CPython specific header files.
+  Patch by Matti Picus.  (Github issue :issue:`6482`)
+
+* Minor fix in C++ ``partial_sum()`` declaration.
+
+
 3.0.11 (2024-08-05)
 ===================
 

{cython-3.0.11 → cython-3.0.12}/Cython/Compiler/Code.py

@@ -140,7 +140,7 @@ class IncludeCode(object):
     #  order     int: sorting order (automatically set by increasing counter)
 
     # Constants for location. If the same include occurs with different
-    # locations, the earliest one takes precedense.
+    # locations, the earliest one takes precedence.
     INITIAL = 0
     EARLY = 1
     LATE = 2

{cython-3.0.11 → cython-3.0.12}/Cython/Compiler/ExprNodes.py

@@ -1052,7 +1052,7 @@ class ExprNode(Node):
                         src = CoerceToPyTypeNode(src, env, type=dst_type)
                 # FIXME: I would expect that CoerceToPyTypeNode(type=dst_type) returns a value of type dst_type
                 #        but it doesn't for ctuples. Thus, we add a PyTypeTestNode which then triggers the
-                #        Python conversion and becomes useless. That sems backwards and inefficient.
+                #        Python conversion and becomes useless. That seems backwards and inefficient.
                 #        We should not need a PyTypeTestNode after a previous conversion above.
                 if not src.type.subtype_of(dst_type):
                     src = PyTypeTestNode(src, dst_type, env)
@@ -9296,6 +9296,9 @@ class DictNode(ExprNode):
                     len(self.key_value_pairs),
                     code.error_goto_if_null(self.result(), self.pos)))
             self.generate_gotref(code)
+            struct_scope = None
+        else:
+            struct_scope = self.type.scope
 
         keys_seen = set()
         key_type = None
@@ -9344,17 +9347,16 @@ class DictNode(ExprNode):
                 if self.exclude_null_values:
                     code.putln('}')
             else:
+                key = str(item.key.value)
+                member = struct_scope.lookup_here(key)
+                assert member is not None, "struct member %s not found, error was not handled during coercion" % key
+                key_cname = member.cname
+                value_cname = item.value.result()
                 if item.value.type.is_array:
                     code.putln("memcpy(%s.%s, %s, sizeof(%s));" % (
-                            self.result(),
-                            item.key.value,
-                            item.value.result(),
-                            item.value.result()))
+                        self.result(), key_cname, value_cname, value_cname))
                 else:
-                    code.putln("%s.%s = %s;" % (
-                            self.result(),
-                            item.key.value,
-                            item.value.result()))
+                    code.putln("%s.%s = %s;" % (self.result(), key_cname, value_cname))
             item.generate_disposal_code(code)
             item.free_temps(code)
 

{cython-3.0.11 → cython-3.0.12}/Cython/Compiler/FlowControl.py

@@ -1381,3 +1381,45 @@ class ControlFlowAnalysis(CythonTransform):
             self.mark_assignment(node.operand, fake_rhs_expr)
         self.visitchildren(node)
         return node
+
+    def visit_BoolBinopNode(self, node):
+        # Note - I don't believe BoolBinopResultNode needs special handling beyond this
+        assert len(node.subexprs) == 2  # operand1 and operand2 only
+
+        next_block = self.flow.newblock()
+        parent = self.flow.block
+
+        self._visit(node.operand1)
+
+        self.flow.nextblock()
+        self._visit(node.operand2)
+        if self.flow.block:
+            self.flow.block.add_child(next_block)
+
+        parent.add_child(next_block)
+
+        if next_block.parents:
+            self.flow.block = next_block
+        else:
+            self.flow.block = None
+        return node
+
+    def visit_CondExprNode(self, node):
+        assert len(node.subexprs) == 3
+        self._visit(node.test)
+        parent = self.flow.block
+        next_block = self.flow.newblock()
+        self.flow.nextblock()
+        self._visit(node.true_val)
+        if self.flow.block:
+            self.flow.block.add_child(next_block)
+        self.flow.nextblock(parent=parent)
+        self._visit(node.false_val)
+        if self.flow.block:
+            self.flow.block.add_child(next_block)
+
+        if next_block.parents:
+            self.flow.block = next_block
+        else:
+            self.flow.block = None
+        return node

{cython-3.0.11 → cython-3.0.12}/Cython/Compiler/Nodes.py

@@ -717,10 +717,8 @@ class CFuncDeclaratorNode(CDeclaratorNode):
                 and not self.has_explicit_exc_clause
                 and self.exception_check
                 and visibility != 'extern'):
-            # If function is already declared from pxd, the exception_check has already correct value.
-            if not (self.declared_name() in env.entries and not in_pxd):
-                self.exception_check = False
             # implicit noexcept, with a warning
+            self.exception_check = False
             warning(self.pos,
                     "Implicit noexcept declaration is deprecated."
                     " Function declaration should contain 'noexcept' keyword.",
@@ -3128,6 +3126,11 @@ class DefNode(FuncDefNode):
             if scope is None:
                 scope = cfunc.scope
             cfunc_type = cfunc.type
+            if cfunc_type.exception_check:
+                # this ensures `legacy_implicit_noexcept` does not trigger
+                # as it would result in a mismatch
+                # (declaration with except, definition with implicit noexcept)
+                has_explicit_exc_clause = True
             if len(self.args) != len(cfunc_type.args) or cfunc_type.has_varargs:
                 error(self.pos, "wrong number of arguments")
                 error(cfunc.pos, "previous declaration here")

{cython-3.0.11 → cython-3.0.12}/Cython/Compiler/PyrexTypes.py

@@ -4669,7 +4669,8 @@ class CTupleType(CType):
 def c_tuple_type(components):
     components = tuple(components)
     if any(c.is_fused for c in components):
-        cname = "<dummy fused ctuple>"  # should never end up in code
+        # should never end up in code but should be unique
+        cname = "<dummy fused ctuple %s>" % repr(components)
     else:
         cname = Naming.ctuple_type_prefix + type_list_identifier(components)
     tuple_type = CTupleType(cname, components)

{cython-3.0.11 → cython-3.0.12}/Cython/Compiler/Visitor.py

@@ -847,7 +847,8 @@ class PrintTree(TreeVisitor):
             elif isinstance(node, Nodes.DefNode):
                 result += "(name=\"%s\")" % node.name
             elif isinstance(node, Nodes.CFuncDefNode):
-                result += "(name=\"%s\")" % node.declared_name()
+                result += "(name=\"%s\", type=\"%s\")" % (
+                    node.declared_name(), getattr(node, "type", None))
             elif isinstance(node, ExprNodes.AttributeNode):
                 result += "(type=%s, attribute=\"%s\")" % (repr(node.type), node.attribute)
             elif isinstance(node, (ExprNodes.ConstNode, ExprNodes.PyConstNode)):

{cython-3.0.11 → cython-3.0.12}/Cython/Includes/libcpp/numeric.pxd

@@ -17,7 +17,7 @@ cdef extern from "<numeric>" namespace "std" nogil:
     void adjacent_difference[InputIt, OutputIt, BinaryOperation](InputIt in_first, InputIt in_last, OutputIt out_first,
                                                                  BinaryOperation op)
 
-    void partial_sum[InputIt, OutputIt](InputIt in_first, OutputIt in_last, OutputIt out_first)
+    void partial_sum[InputIt, OutputIt](InputIt in_first, InputIt in_last, OutputIt out_first)
 
     void partial_sum[InputIt, OutputIt, BinaryOperation](InputIt in_first, InputIt in_last, OutputIt out_first,
                                                          BinaryOperation op)

{cython-3.0.11 → cython-3.0.12}/Cython/Shadow.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 
 # Possible version formats: "3.1.0", "3.1.0a1", "3.1.0a1.dev0"
-__version__ = "3.0.11"
+__version__ = "3.0.12"
 
 try:
     from __builtin__ import basestring

{cython-3.0.11 → cython-3.0.12}/Cython/Utility/Coroutine.c

@@ -501,7 +501,7 @@ static int __pyx_Generator_init(PyObject *module); /*proto*/
 //@requires: ModuleSetupCode.c::IncludeStructmemberH
 
 #include <frameobject.h>
-#if PY_VERSION_HEX >= 0x030b00a6
+#if PY_VERSION_HEX >= 0x030b00a6 && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif

{cython-3.0.11 → cython-3.0.12}/Cython/Utility/Exceptions.c

@@ -914,7 +914,7 @@ static void __Pyx_AddTraceback(const char *funcname, int c_line,
 #include "compile.h"
 #include "frameobject.h"
 #include "traceback.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
+#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif

{cython-3.0.11 → cython-3.0.12}/Cython/Utility/ObjectHandling.c

@@ -2530,7 +2530,7 @@ static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args,
 #if !CYTHON_VECTORCALL
 #if PY_VERSION_HEX >= 0x03080000
   #include "frameobject.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
+#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif

{cython-3.0.11 → cython-3.0.12}/Cython/Utility/Overflow.c

@@ -1,7 +1,7 @@
 /*
 These functions provide integer arithmetic with integer checking.  They do not
 actually raise an exception when an overflow is detected, but rather set a bit
-in the overflow parameter.  (This parameter may be re-used across several
+in the overflow parameter.  (This parameter may be reused across several
 arithmetic operations, so should be or-ed rather than assigned to.)
 
 The implementation is divided into two parts, the signed and unsigned basecases,

{cython-3.0.11 → cython-3.0.12}/Cython/Utility/Profile.c

@@ -38,7 +38,7 @@
   #include "compile.h"
   #include "frameobject.h"
   #include "traceback.h"
-#if PY_VERSION_HEX >= 0x030b00a6
+#if PY_VERSION_HEX >= 0x030b00a6 && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif

{cython-3.0.11 → cython-3.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Cython
-Version: 3.0.11
+Version: 3.0.12
 Summary: The Cython compiler for writing C extensions in the Python language.
 Home-page: https://cython.org/
 Author: Robert Bradshaw, Stefan Behnel, Dag Seljebotn, Greg Ewing, et al.
@@ -28,9 +28,12 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Programming Language :: Python :: Implementation :: Stackless
 Classifier: Programming Language :: C
+Classifier: Programming Language :: C++
 Classifier: Programming Language :: Cython
 Classifier: Topic :: Software Development :: Code Generators
 Classifier: Topic :: Software Development :: Compilers

{cython-3.0.11 → cython-3.0.12}/pyximport/_pyximport3.py

@@ -229,7 +229,7 @@ class PyxImportMetaFinder(MetaPathFinder):
 
     def find_spec(self, fullname, path, target=None):
         if not path:
-            path = [os.getcwd()]  # top level import --
+            path = [os.getcwd()] + sys.path  # top level import --
         if "." in fullname:
             *parents, name = fullname.split(".")
         else:
@@ -264,8 +264,11 @@ class PyImportMetaFinder(MetaPathFinder):
         self.blocked_modules = ['Cython', 'pyxbuild', 'pyximport.pyxbuild',
                                 'distutils', 'cython']
         self.blocked_packages = ['Cython.', 'distutils.']
+        self.found = False
 
     def find_spec(self, fullname, path, target=None):
+        if self.found:
+            return None
         if fullname in sys.modules:
             return None
         if any([fullname.startswith(pkg) for pkg in self.blocked_packages]):
@@ -277,7 +280,7 @@ class PyImportMetaFinder(MetaPathFinder):
         self.blocked_modules.append(fullname)
         name = fullname
         if not path:
-            path = [os.getcwd()]  # top level import --
+            path = [os.getcwd()] + sys.path  # top level import --
         try:
             for entry in path:
                 if os.path.isdir(os.path.join(entry, name)):
@@ -290,6 +293,7 @@ class PyImportMetaFinder(MetaPathFinder):
                 if not os.path.exists(filename):
                     continue
 
+                self.found = True
                 return spec_from_file_location(
                     fullname, filename,
                     loader=PyxImportLoader(filename, self.pyxbuild_dir, self.inplace, self.language_level),

{cython-3.0.11 → cython-3.0.12}/setup.py

@@ -292,9 +292,12 @@ def run_build():
             "Programming Language :: Python :: 3.10",
             "Programming Language :: Python :: 3.11",
             "Programming Language :: Python :: 3.12",
+            "Programming Language :: Python :: 3.13",
             "Programming Language :: Python :: Implementation :: CPython",
             "Programming Language :: Python :: Implementation :: PyPy",
+            "Programming Language :: Python :: Implementation :: Stackless",
             "Programming Language :: C",
+            "Programming Language :: C++",
             "Programming Language :: Cython",
             "Topic :: Software Development :: Code Generators",
             "Topic :: Software Development :: Compilers",

cython-3.0.12/tests/errors/w_noexcept.pxd

@@ -0,0 +1,2 @@
+cdef object test_return_object_noexcept_in_pxd(x) noexcept
+cdef object test_return_object_in_pxd(x)

{cython-3.0.11 → cython-3.0.12}/tests/errors/w_noexcept.pyx

@@ -10,6 +10,12 @@ ctypedef fused double_or_object:
 cdef object test_return_object_noexcept(x) noexcept: # Err
     return x
 
+cdef object test_return_object_noexcept_in_pxd(x) noexcept: # Err
+    return x
+
+cdef object test_return_object_in_pxd(x): # OK
+    return x
+
 cdef str test_return_str_noexcept() noexcept: # Err
     return 'a'
 
@@ -70,9 +76,13 @@ def test_pure_return_fused_noexcept(x: double_or_object) -> double_or_object: #
 
 _ERRORS = """
 10:39: noexcept clause is ignored for function returning Python object
-13:33: noexcept clause is ignored for function returning Python object
-16:18: noexcept clause is ignored for function returning Python object
-38:0: noexcept clause is ignored for function returning Python object
-43:0: noexcept clause is ignored for function returning Python object
-48:0: noexcept clause is ignored for function returning Python object
+13:46: noexcept clause is ignored for function returning Python object
+19:33: noexcept clause is ignored for function returning Python object
+22:18: noexcept clause is ignored for function returning Python object
+44:0: noexcept clause is ignored for function returning Python object
+49:0: noexcept clause is ignored for function returning Python object
+54:0: noexcept clause is ignored for function returning Python object
+
+# from pxd
+1:46: noexcept clause is ignored for function returning Python object
 """

cython-3.0.12/tests/errors/w_noexcept_pure.pxd

@@ -0,0 +1,7 @@
+cdef object test_return_object_noexcept_in_pxd(x) noexcept
+cdef object test_return_object_in_pxd(x)
+
+cdef extern from *:
+    cdef object extern_return_object() # Ok
+
+    cdef object extern_noexcept() noexcept # Ok

cython-3.0.12/tests/errors/w_noexcept_pure.py

@@ -0,0 +1,48 @@
+# mode: error
+# tag: werror
+
+import cython
+
+@cython.cfunc
+@cython.exceptval(check=False)
+def test_return_object_noexcept(x) -> object:  # Err
+    return x
+
+# declared in pxd as noexcept and cdef
+def test_return_object_noexcept_in_pxd(x):  # Err
+    return x
+
+# declared in pxd as cdef
+def test_return_object_in_pxd(x):  # OK
+    return x
+
+@cython.cfunc
+@cython.exceptval(check=False)
+def test_return_str_noexcept() -> str:  # Err
+    return 'a'
+
+@cython.cfunc
+@cython.exceptval(check=False)
+def test_noexcept():  # Err
+    pass
+
+@cython.cfunc
+def test_implicit_noexcept():  # Ok
+    pass
+
+@cython.cfunc
+def test_return_object(x) -> object:  # Ok
+    return x
+
+@cython.cfunc
+def test_return_str() -> str:  # Ok
+    return 'a'
+
+_ERRORS = """
+6:0: noexcept clause is ignored for function returning Python object
+19:0: noexcept clause is ignored for function returning Python object
+24:0: noexcept clause is ignored for function returning Python object
+
+# from pxd
+1:46: noexcept clause is ignored for function returning Python object
+"""

cython-3.0.12/tests/pyximport/pyximport_pythonpath.srctree

@@ -0,0 +1,47 @@
+PYTHON -c "import pyximport_test; pyximport_test.test()"
+PYTHON -c "import pyximport_pyimport_test; pyximport_pyimport_test.test()"
+
+########## mydir/mytest.pyx ##########
+
+test_string = "MY_TEST"
+
+########## mydir/py_mytest.py ##########
+
+import cython
+
+test_string = "MY_PY_TEST"
+compiled = cython.compiled
+
+######## pyximport_test.py ########
+
+import os
+import sys
+import pyximport
+
+sys.path.append('mydir')
+
+pyximport.DEBUG_IMPORT = True
+
+pyximport.install(build_dir=os.path.join(os.path.dirname(__file__), "TEST_TMP"))
+
+def test():
+    import mytest
+    assert mytest.test_string == "MY_TEST"
+
+######## pyximport_pyimport_test.py ########
+
+import os
+import sys
+import pyximport
+
+sys.path.append('mydir')
+
+pyximport.DEBUG_IMPORT = True
+
+pyximport.install(pyximport=False, pyimport=True,
+                  build_dir=os.path.join(os.path.dirname(__file__), "TEST_TMP"))
+
+def test():
+    import py_mytest
+    assert py_mytest.test_string == "MY_PY_TEST"
+    assert py_mytest.compiled

{cython-3.0.11 → cython-3.0.12}/tests/run/cstruct.pyx

@@ -1,14 +1,25 @@
+# mode: run
+#tag: struct
+
 cdef struct Grail
 
+
 cdef struct Spam:
     int i
     char c
     float *p[42]
     Grail *g
 
+
 cdef struct Grail:
     Spam *s
 
+
+cdef struct ReservedNames:
+    int case
+    int do
+
+
 cdef Spam spam, ham
 
 cdef void eggs_i(Spam s):
@@ -81,3 +92,14 @@ def assign_fields_in_loop():
 
     assert s.a == s.b
     return s.b
+
+
+def reserved_names():
+    """
+    >>> reserved_names()
+    (5, 9)
+    """
+    cdef ReservedNames s1 = ReservedNames(case=5, do=9)
+    cdef ReservedNames s2
+    s2.case, s2.do = s1.case, s1.do
+    return (s2.case, s2.do)

{cython-3.0.11 → cython-3.0.12}/tests/run/ctuple.pyx

@@ -279,3 +279,21 @@ def test_unop((int, int) ab):
     True
     """
     return not ab
+
+# This is testing both that fused ctuples work, and that
+# different fused ctuples end up as separate types
+cdef (cython.floating, cython.floating) two_fused(cython.floating x):
+    return x, x
+
+cdef (cython.floating, cython.floating, cython.floating) three_fused(cython.floating x):
+    return x, x, x
+
+def test_fused():
+    """
+    >>> a, b = test_fused()
+    >>> a
+    (1.0, 1.0)
+    >>> b
+    (2.0, 2.0, 2.0)
+    """
+    return two_fused(1.0), three_fused(2.0)