aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Lib/fractions.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/fractions.py')
-rw-r--r--Lib/fractions.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/Lib/fractions.py b/Lib/fractions.py
index a8c67068522..c1b12e7a1c0 100644
--- a/Lib/fractions.py
+++ b/Lib/fractions.py
@@ -170,7 +170,11 @@ _FLOAT_FORMAT_SPECIFICATION_MATCHER = re.compile(r"""
(?P<zeropad>0(?=[0-9]))?
(?P<minimumwidth>[0-9]+)?
(?P<thousands_sep>[,_])?
- (?:\.(?P<precision>[0-9]+))?
+ (?:\.
+ (?=[,_0-9]) # lookahead for digit or separator
+ (?P<precision>[0-9]+)?
+ (?P<frac_separators>[,_])?
+ )?
(?P<presentation_type>[eEfFgG%])
""", re.DOTALL | re.VERBOSE).fullmatch
@@ -499,6 +503,7 @@ class Fraction(numbers.Rational):
minimumwidth = int(match["minimumwidth"] or "0")
thousands_sep = match["thousands_sep"]
precision = int(match["precision"] or "6")
+ frac_sep = match["frac_separators"] or ""
presentation_type = match["presentation_type"]
trim_zeros = presentation_type in "gG" and not alternate_form
trim_point = not alternate_form
@@ -555,6 +560,9 @@ class Fraction(numbers.Rational):
if trim_zeros:
frac_part = frac_part.rstrip("0")
separator = "" if trim_point and not frac_part else "."
+ if frac_sep:
+ frac_part = frac_sep.join(frac_part[pos:pos + 3]
+ for pos in range(0, len(frac_part), 3))
trailing = separator + frac_part + suffix
# Do zero padding if required.