mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Allow whitespace around a slash in fraction string inputs (GH-96496)

Browse source
This commit is contained in:
Raymond Hettinger 2022-09-02 11:10:58 -05:00 • committed by GitHub
parent 91f40f3f78
commit 656167db81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Doc/library/fractions.rst
View file

@ -98,6 +98,9 @@ another rational number, or from a string.
:class:`Fraction` implements ``__int__`` now to satisfy :class:`Fraction` implements ``__int__`` now to satisfy
``typing.SupportsInt`` instance checks. ``typing.SupportsInt`` instance checks.
.. versionchanged:: 3.12
Space is allowed around the slash for string inputs: `Fraction('2 / 3')`.
.. attribute:: numerator .. attribute:: numerator
Numerator of the Fraction in lowest term. Numerator of the Fraction in lowest term.

2
Lib/fractions.py
View file

@ -26,7 +26,7 @@ _RATIONAL_FORMAT = re.compile(r"""
(?=\d|\.\d) # lookahead for digit or .digit (?=\d|\.\d) # lookahead for digit or .digit
(?P<num>\d*|\d+(_\d+)*) # numerator (possibly empty) (?P<num>\d*|\d+(_\d+)*) # numerator (possibly empty)
(?: # followed by (?: # followed by
(?:/(?P<denom>\d+(_\d+)*))? # an optional denominator (?:\s*/\s*(?P<denom>\d+(_\d+)*))? # an optional denominator
| # or | # or
(?:\.(?P<decimal>d*|\d+(_\d+)*))? # an optional fractional part (?:\.(?P<decimal>d*|\d+(_\d+)*))? # an optional fractional part
(?:E(?P<exp>[-+]?\d+(_\d+)*))? # and optional exponent (?:E(?P<exp>[-+]?\d+(_\d+)*))? # and optional exponent

4
Lib/test/test_fractions.py
View file

@ -162,6 +162,7 @@ class FractionTest(unittest.TestCase):
def testFromString(self): def testFromString(self):
self.assertEqual((5, 1), _components(F("5"))) self.assertEqual((5, 1), _components(F("5")))
self.assertEqual((3, 2), _components(F("3/2"))) self.assertEqual((3, 2), _components(F("3/2")))
self.assertEqual((3, 2), _components(F("3 / 2")))
self.assertEqual((3, 2), _components(F(" \n +3/2"))) self.assertEqual((3, 2), _components(F(" \n +3/2")))
self.assertEqual((-3, 2), _components(F("-3/2 "))) self.assertEqual((-3, 2), _components(F("-3/2 ")))
self.assertEqual((13, 2), _components(F(" 013/02 \n "))) self.assertEqual((13, 2), _components(F(" 013/02 \n ")))
@ -190,9 +191,6 @@ class FractionTest(unittest.TestCase):
self.assertRaisesMessage( self.assertRaisesMessage(
ValueError, "Invalid literal for Fraction: '/2'", ValueError, "Invalid literal for Fraction: '/2'",
F, "/2") F, "/2")
self.assertRaisesMessage(
ValueError, "Invalid literal for Fraction: '3 /2'",
F, "3 /2")
self.assertRaisesMessage( self.assertRaisesMessage(
# Denominators don't need a sign. # Denominators don't need a sign.
ValueError, "Invalid literal for Fraction: '3/+2'", ValueError, "Invalid literal for Fraction: '3/+2'",

2
Misc/NEWS.d/next/Documentation/2022-09-01-17-03-04.gh-issue-96432.1EJ1-4.rst Normal file
View file

@ -0,0 +1,2 @@
Fraction literals now support whitespace around the forward slash,
`Fraction('2 / 3')`.