Merge branch '0.29.x'

CHANGES.rst

@@ -454,6 +454,12 @@ Other changes
 Bugs fixed
 ----------
 
+* The ``@classmethod`` decorator no longer rejects unknown input from other decorators.
+  Patch by David Woods.  (Github issue #3660)
+
+* Fused types could leak into unrelated usages.
+  Patch by David Woods.  (Github issue #3642)
+
 * Now uses ``Py_SET_SIZE()`` and ``Py_SET_REFCNT()`` in Py3.9+ to avoid low-level
   write access to these object fields.
   Patch by Victor Stinner.  (Github issue #3639)

Cython/Utility/CythonFunction.c

@@ -1484,8 +1484,7 @@ static PyObject* __Pyx_Method_ClassMethod(PyObject *method) {
         // python classes
         return PyClassMethod_New(PyMethod_GET_FUNCTION(method));
     }
-    else
-    {
+    else {
         return PyClassMethod_New(method);
     }
 }

tests/run/fused_types.pyx

@@ -485,6 +485,7 @@ def test_fused_in_check():
     print(in_check_2[float, double](1.0, 2.0))
     print(in_check_3[float](1.0))
 
+
 ### see GH3642 - presence of cdef inside "unrelated" caused a type to be incorrectly inferred
 cdef unrelated(cython.floating x):
     cdef cython.floating t = 1