]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-119838: Treat Fraction as a real value in mixed arithmetic operations with complex...
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 3 Jun 2024 09:29:01 +0000 (12:29 +0300)
committerGitHub <noreply@github.com>
Mon, 3 Jun 2024 09:29:01 +0000 (12:29 +0300)
Lib/fractions.py
Lib/test/test_fractions.py
Misc/NEWS.d/next/Library/2024-05-31-13-56-21.gh-issue-119838.H6XHlE.rst [new file with mode: 0644]

index 95adccd86e33a0e9f611c01553de42e8cbde713d..565503911bbe97f482282fda4003a95ac6727e84 100644 (file)
@@ -668,7 +668,7 @@ class Fraction(numbers.Rational):
             elif isinstance(b, float):
                 return fallback_operator(float(a), b)
             elif handle_complex and isinstance(b, complex):
-                return fallback_operator(complex(a), b)
+                return fallback_operator(float(a), b)
             else:
                 return NotImplemented
         forward.__name__ = '__' + fallback_operator.__name__ + '__'
@@ -681,7 +681,7 @@ class Fraction(numbers.Rational):
             elif isinstance(a, numbers.Real):
                 return fallback_operator(float(a), float(b))
             elif handle_complex and isinstance(a, numbers.Complex):
-                return fallback_operator(complex(a), complex(b))
+                return fallback_operator(complex(a), float(b))
             else:
                 return NotImplemented
         reverse.__name__ = '__r' + fallback_operator.__name__ + '__'
index 3c7780e40db096f50c686a644491624de6cbc8fe..71865f68eb0f12d0d2daa8b5803b7fd44d5b0365 100644 (file)
@@ -806,10 +806,7 @@ class FractionTest(unittest.TestCase):
         self.assertTypedEquals(F(3, 2) * Polar(4, 2), Polar(F(6, 1), 2))
         self.assertTypedEquals(F(3, 2) * Polar(4.0, 2), Polar(6.0, 2))
         self.assertTypedEquals(F(3, 2) * Rect(4, 3), Rect(F(6, 1), F(9, 2)))
-        with self.assertWarnsRegex(DeprecationWarning,
-                "argument 'real' must be a real number, not complex"):
-            self.assertTypedEquals(F(3, 2) * RectComplex(4, 3),
-                                   RectComplex(6.0+0j, 4.5+0j))
+        self.assertTypedEquals(F(3, 2) * RectComplex(4, 3), RectComplex(6.0, 4.5))
         self.assertRaises(TypeError, operator.mul, Polar(4, 2), F(3, 2))
         self.assertTypedEquals(Rect(4, 3) * F(3, 2), 6.0 + 4.5j)
         self.assertEqual(F(3, 2) * SymbolicComplex('X'), SymbolicComplex('3/2 * X'))
diff --git a/Misc/NEWS.d/next/Library/2024-05-31-13-56-21.gh-issue-119838.H6XHlE.rst b/Misc/NEWS.d/next/Library/2024-05-31-13-56-21.gh-issue-119838.H6XHlE.rst
new file mode 100644 (file)
index 0000000..17a8732
--- /dev/null
@@ -0,0 +1,3 @@
+In mixed arithmetic operations with :class:`~fractions.Fraction` and
+complex, the fraction is now converted to :class:`float` instead of
+:class:`complex`.