FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Ignore quoted percent and per-mille scaling symbols by vhinayindia · Pull Request #1370 · python-babel/babel · GitHub

Repository navigation

Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
11 changes: 8 additions & 3 deletions babel/numbers.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -1397,14 +1397,19 @@ def __repr__(self) -> str:
def compute_scale(self) -> Literal[0, 2, 3]:
"""Return the scaling factor to apply to the number before rendering.

Auto-set to a factor of 2 or 3 if presence of a ``%`` or ``‰`` sign is
Auto-set to a factor of 2 or 3 if an unquoted ``%`` or ``‰`` sign is
detected in the prefix or suffix of the pattern. Default is to not mess
with the scale at all and keep it to 0.
"""
# Ignore complete quoted spans, as in the affix rendering in apply().
affixes = ''.join(
re.sub(r"'[^']*'", '', affix)
for affix in self.prefix + self.suffix
)
scale = 0
if '%' in ''.join(self.prefix + self.suffix):
if '%' in affixes:
scale = 2
elif '‰' in ''.join(self.prefix + self.suffix):
elif '‰' in affixes:
scale = 3
return scale

Expand Down
56 changes: 56 additions & 0 deletions tests/test_numbers.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,62 @@ def test_single_quotes_in_pattern():
assert numbers.format_decimal(12, "'#'0 o''clock", locale='en') == "#12 o'clock"


@pytest.mark.parametrize('formatter', [numbers.format_decimal, numbers.format_percent])
@pytest.mark.parametrize(
('pattern', 'value', 'expected'),
[
("0.0'%'", '12.3', '12.3%'),
("0.0'%'", '-12.3', '-12.3%'),
("'%'0.0", '12.3', '%12.3'),
("'%'0.0", '-12.3', '-%12.3'),
("0.0'‰'", '12.3', '12.3‰'),
("0.0'‰'", '-12.3', '-12.3‰'),
("'‰'0.0", '12.3', '‰12.3'),
("'‰'0.0", '-12.3', '-‰12.3'),
("0.0''%", '12.3', "1230.0'%"),
("0.0''‰", '12.3', "12300.0'‰"),
("0.0'%'‰", '12.3', '12300.0%‰'),
("‰0.0'%'", '12.3', '‰12300.0%'),
("0.0'‰'%", '12.3', '1230.0‰%'),
("0.0'%';(0.0'%')", '-12.3', '(12.3%)'),
("0.0'‰';(0.0'‰')", '-12.3', '(12.3‰)'),
('0.0%;(0.0%)', '-12.3', '(1230.0%)'),
('0.0‰;(0.0‰)', '-12.3', '(12300.0‰)'),
("0.0E0'%'", '12.3', '1.2E1%'),
("@@'%'", '12.3', '12%'),
("0.0'%", '12.3', "1230.0'%"),
("0.0'‰", '12.3', "12300.0'‰"),
("0.0'%;0.0‰", '-12.3', '1230.0‰'),
],
)
def test_quoted_scale_symbols(formatter, pattern, value, expected):
assert formatter(decimal.Decimal(value), pattern, locale='en_US') == expected


@pytest.mark.parametrize(
('pattern', 'scale'),
[
("0'%'", 0),
("0'‰'", 0),
("0'%'‰", 3),
('0%', 2),
('0‰', 3),
('0%‰', 2),
('0‰%', 2),
('0;(0%)', 2),
('0;(0‰)', 3),
("0;(0'%')", 0),
("0;(0'‰')", 0),
("0' don''t scale %'", 0),
("0' don''t scale ‰'", 0),
("0'%;0‰", 2),
("0'‰;0%", 2),
],
)
def test_number_pattern_scale(pattern, scale):
assert numbers.parse_pattern(pattern).scale == scale


def test_format_currency_with_none_locale_with_default(monkeypatch):
"""Test that the default locale is used when locale is None."""
monkeypatch.setattr(numbers, "LC_MONETARY", "fi_FI")
Expand Down

Back | FazBrowse Home | New Git URL