+1

Author: skirpichev

Lib/test/test_types.py

@@ -2410,9 +2410,6 @@ def test_static_types_inherited_slots(self):
         def collate_results(raw):
             results = {}
             for cls, attr, wrapper in raw:
-                if cls is imaginary and slot in ('__abs__', '__bool__',
-                                                 '__pow__', '__rpow__'):
-                    continue
                 key = cls, attr
                 assert key not in results, (results, key, wrapper)
                 results[key] = wrapper
@@ -2431,10 +2428,6 @@ def collate_results(raw):
 
         for key, expected in main_results.items():
             cls, attr = key
-            if cls == repr(imaginary) and attr in ('__abs__', '__bool__',
-                                                   '__pow__', '__rpow__'):
-                interp_results.pop(key)
-                continue
             with self.subTest(cls=cls, slotattr=attr):
                 actual = interp_results.pop(key)
                 self.assertEqual(actual, expected)

Objects/complexobject.c

@@ -1394,6 +1394,7 @@ imaginary_new_impl(PyTypeObject *type, PyObject *x)
     }
 
     PyNumberMethods *nbx = Py_TYPE(x)->tp_as_number;
+
     if (nbx == NULL || (nbx->nb_float == NULL && nbx->nb_index == NULL
                         && !PyFloat_Check(x)))
     {
@@ -1404,17 +1405,17 @@ imaginary_new_impl(PyTypeObject *type, PyObject *x)
     }
 
     PyObject* tmp = PyNumber_Float(x);
+
     if (tmp == NULL) {
         return NULL;
     }
 
     PyObject *ret = type->tp_alloc(type, 0);
+
     if (ret != NULL) {
         ((PyComplexObject *)ret)->cval = (Py_complex) {0.0, PyFloat_AS_DOUBLE(tmp)};
     }
-
     Py_DECREF(tmp);
-
     return ret;
 }
 
@@ -1423,6 +1424,7 @@ PyImaginary_FromDouble(double imag)
 {
     /* Inline PyObject_New */
     PyComplexObject *op = PyObject_Malloc(sizeof(PyComplexObject));
+
     if (op == NULL) {
         return PyErr_NoMemory();
     }
@@ -1454,6 +1456,7 @@ imaginary_add(PyObject *v, PyObject *w)
 {
     if (!PyImaginary_Check(v)) {
         PyObject *tmp = v;
+
         v = w;
         w = tmp;
     }
@@ -1468,7 +1471,6 @@ imaginary_add(PyObject *v, PyObject *w)
     else if (real_to_double(&w, &b) < 0) {
         return w;
     }
-
     return PyComplex_FromDoubles(b, a);
 }
 
@@ -1503,7 +1505,6 @@ imaginary_sub(PyObject *v, PyObject *w)
     else if (real_to_double(&w, &b) < 0) {
         return w;
     }
-
     return PyComplex_FromDoubles(-b, a);
 }
 
@@ -1512,6 +1513,7 @@ imaginary_mul(PyObject *v, PyObject *w)
 {
     if (!PyImaginary_Check(v)) {
         PyObject *tmp = v;
+
         v = w;
         w = tmp;
     }
@@ -1530,7 +1532,6 @@ imaginary_mul(PyObject *v, PyObject *w)
     else if (real_to_double(&w, &b) < 0) {
         return w;
     }
-
     return PyImaginary_FromDouble(a*b);
 }
 
@@ -1544,10 +1545,12 @@ imaginary_div(PyObject *v, PyObject *w)
         if (b) {
             if (PyImaginary_Check(v)) {
                 double a = ((PyComplexObject *)(v))->cval.imag;
+
                 return PyFloat_FromDouble(a/b);
             }
             if (PyComplex_Check(v)) {
                 Py_complex a = ((PyComplexObject *)(v))->cval;
+
                 return PyComplex_FromDoubles(a.imag/b, -a.real/b);
             }
             if (real_to_double(&v, &a) < 0) {
@@ -1562,6 +1565,7 @@ imaginary_div(PyObject *v, PyObject *w)
 
         if (PyComplex_Check(w)) {
             Py_complex b = ((PyComplexObject *)(w))->cval;
+
             errno = 0;
             b = _Py_rc_quot(a, b);
             b = (Py_complex){-b.imag, b.real};
@@ -1576,7 +1580,6 @@ imaginary_div(PyObject *v, PyObject *w)
             return PyImaginary_FromDouble(a/b);
         }
     }
-
     PyErr_SetString(PyExc_ZeroDivisionError, "complex division by zero");
     return NULL;
 }
@@ -1592,6 +1595,7 @@ imaginary_conjugate_impl(PyComplexObject *self)
 /*[clinic end generated code: output=247bb3742efd769d input=8dcd1c93a873c492]*/
 {
     Py_complex c = self->cval;
+
     c.imag = -c.imag;
     return PyImaginary_FromDouble(c.imag);
 }
@@ -1606,6 +1610,7 @@ imaginary___getnewargs___impl(PyComplexObject *self)
 /*[clinic end generated code: output=a587156eda821f7d input=da4b7e53915987d5]*/
 {
     Py_complex c = self->cval;
+
     return Py_BuildValue("(d)", c.imag);
 }