* complex_new_impl: L944, L951, L958, L965, L985, L994

skirpichev · skirpichev · commit c25563c68aba · 2023-09-24T13:06:15.000+03:00
diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
@@ -338,6 +338,8 @@ def test_conjugate(self):
         self.assertClose(complex(5.3, 9.8).conjugate(), 5.3-9.8j)
 
     def test_constructor(self):
+        from test.test_capi.test_getargs import Complex
+
         class NS:
             def __init__(self, value): self.value = value
             def __complex__(self): return self.value
@@ -346,6 +348,8 @@ def __complex__(self): return self.value
         self.assertRaises(TypeError, complex, {})
         self.assertRaises(TypeError, complex, NS(1.5))
         self.assertRaises(TypeError, complex, NS(1))
+        self.assertRaises(TypeError, complex, object())
+        self.assertRaises(TypeError, complex, Complex(), object())
 
         self.assertAlmostEqual(complex("1+10j"), 1+10j)
         self.assertAlmostEqual(complex(10), 10+0j)
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
@@ -940,9 +940,7 @@ complex_new_impl(PyTypeObject *type, PyObject *r, PyObject *i)
                      "complex() first argument must be a string or a number, "
                      "not '%.200s'",
                      Py_TYPE(r)->tp_name);
-        if (own_r) {
-            Py_DECREF(r);
-        }
+        assert(!own_r);
         return NULL;
     }
     if (i != NULL) {
@@ -974,20 +972,17 @@ complex_new_impl(PyTypeObject *type, PyObject *r, PyObject *i)
            value is (properly) of the builtin complex type. */
         cr = ((PyComplexObject*)r)->cval;
         cr_is_complex = 1;
-        if (own_r) {
-            Py_DECREF(r);
-        }
+        assert(own_r);
+        Py_DECREF(r);
     }
     else {
         /* The "real" part really is entirely real, and contributes
            nothing in the imaginary direction.
            Just treat it as a double. */
         tmp = PyNumber_Float(r);
-        if (own_r) {
-            /* r was a newly created complex number, rather
-               than the original "real" argument. */
-            Py_DECREF(r);
-        }
+        /* r was a newly created complex number, rather
+           than the original "real" argument. */
+        assert(!own_r);
         if (tmp == NULL)
             return NULL;
         assert(PyFloat_Check(tmp));
