Merge branch 'main' into float-from-number

serhiy-storchaka · Jul 15, 2024 · Jun 21, 2021 · Jun 21, 2021 · Sep 4, 2022 · Oct 6, 2023
commit b9e1473d500cf807625eae45a0aed6793dfa8900
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
@@ -707,7 +707,7 @@ def non_Python_modules(): r"""
 
     >>> import builtins
     >>> tests = doctest.DocTestFinder().find(builtins)
-    >>> 820 < len(tests) < 850 # approximate number of objects with docstrings
+    >>> 825 < len(tests) < 845 # approximate number of objects with docstrings
     True
     >>> real_tests = [t for t in tests if len(t.examples) > 0]
     >>> len(real_tests) # objects that actually have doctests

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
@@ -253,6 +253,33 @@ def test_keyword_args(self):
         with self.assertRaisesRegex(TypeError, 'keyword argument'):
             float(x='3.14')
 
+    def test_keywords_in_subclass(self):
+        class subclass(float):
+            pass
+        u = subclass(2.5)
+        self.assertIs(type(u), subclass)
+        self.assertEqual(float(u), 2.5)
+        with self.assertRaises(TypeError):
+            subclass(x=0)
+
+        class subclass_with_init(float):
+            def __init__(self, arg, newarg=None):
+                self.newarg = newarg
+        u = subclass_with_init(2.5, newarg=3)
+        self.assertIs(type(u), subclass_with_init)
+        self.assertEqual(float(u), 2.5)
+        self.assertEqual(u.newarg, 3)
+
+        class subclass_with_new(float):
+            def __new__(cls, arg, newarg=None):
+                self = super().__new__(cls, arg)
+                self.newarg = newarg
+                return self
+        u = subclass_with_new(2.5, newarg=3)
+        self.assertIs(type(u), subclass_with_new)
+        self.assertEqual(float(u), 2.5)
+        self.assertEqual(u.newarg, 3)
+
     def assertEqualAndType(self, actual, expected_value, expected_type):
         self.assertEqual(actual, expected_value)
         self.assertIs(type(actual), expected_type)

diff --git a/Objects/clinic/complexobject.c.h b/Objects/clinic/complexobject.c.h
diff --git a/Objects/clinic/floatobject.c.h b/Objects/clinic/floatobject.c.h
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
@@ -694,6 +694,25 @@ complex___format___impl(PyComplexObject *self, PyObject *format_spec)
     return _PyUnicodeWriter_Finish(&writer);
 }
 
+/*[clinic input]
+complex.__complex__
+
+Convert this value to exact type complex.
+[clinic start generated code]*/
+
+static PyObject *
+complex___complex___impl(PyComplexObject *self)
+/*[clinic end generated code: output=e6b35ba3d275dc9c input=3589ada9d27db854]*/
+{
+    if (PyComplex_CheckExact(self)) {
+        Py_INCREF(self);
+        return (PyObject *)self;
+    }
+    else {
+        return PyComplex_FromCComplex(self->cval);
+    }
+}
+
 
 static PyObject *
 complex_from_string_inner(const char *s, Py_ssize_t len, void *type)
@@ -1033,6 +1052,7 @@ complex_from_number(PyTypeObject *type, PyObject *number)
 static PyMethodDef complex_methods[] = {
     COMPLEX_FROM_NUMBER_METHODDEF
     COMPLEX_CONJUGATE_METHODDEF
+    COMPLEX___COMPLEX___METHODDEF
     COMPLEX___GETNEWARGS___METHODDEF
     COMPLEX___FORMAT___METHODDEF
     {NULL,              NULL}           /* sentinel */