Skip to content

parse_decimal: reject underscore grouping with strict=True #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glaziermag wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Open

parse_decimal: reject underscore grouping with strict=True #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion babel/numbers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ def parse_decimal(
parsed = decimal.Decimal(string.replace(group_symbol, '').replace(decimal_symbol, '.'))
except decimal.InvalidOperation as exc:
raise NumberFormatError(f"{string!r} is not a valid decimal number") from exc
if strict and group_symbol in string:
if strict and (group_symbol in string or '_' in string):
proper = format_decimal(
parsed,
locale=locale,
Expand Down
10 changes: 10 additions & 0 deletions tests/test_numbers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,16 @@ def test_parse_decimal_group_separator_can_be_any_space(string):
assert decimal.Decimal('1099.98') == numbers.parse_decimal(string, locale='fr')


@pytest.mark.parametrize(('locale', 'grouped'), [('en_US', '1,000'), ('de', '1.000')])
def test_parse_decimal_strict_rejects_underscores(locale, grouped):
with pytest.raises(numbers.NumberFormatError):
numbers.parse_decimal('1_000', locale=locale, strict=True)

assert numbers.parse_decimal('1_000', locale=locale) == decimal.Decimal('1000')
assert numbers.parse_decimal('1000', locale=locale, strict=True) == decimal.Decimal('1000')
assert numbers.parse_decimal(grouped, locale=locale, strict=True) == decimal.Decimal('1000')


def test_parse_grouping():
assert numbers.parse_grouping('##') == (1000, 1000)
assert numbers.parse_grouping('#,###') == (3, 3)
Expand Down