Skip to content

fix: preserve original skeleton in KeyError when fuzzy format_skeleton finds no match #1275

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
SAY-5 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −3
Open

fix: preserve original skeleton in KeyError when fuzzy format_skeleton finds no match #1275

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
6 changes: 3 additions & 3 deletions babel/dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ def format_skeleton(
>>> format_skeleton('GH', t, fuzzy=True, locale='fi_FI') # GH is not in the Finnish locale and there is no close match, an error is thrown
Traceback (most recent call last):
...
KeyError: None
KeyError: 'GH'

After the skeleton is resolved to a pattern `format_datetime` is called so
all timezone processing etc is the same as for that.
Expand All @@ -881,12 +881,12 @@ def format_skeleton(
:param tzinfo: the time-zone to apply to the time for display
:param fuzzy: If the skeleton is not found, allow choosing a skeleton that's
close enough to it. If there is no close match, a `KeyError`
is thrown.
with the requested skeleton is thrown.
:param locale: a `Locale` object or a locale identifier. Defaults to the system time locale.
"""
locale = Locale.parse(locale or LC_TIME)
if fuzzy and skeleton not in locale.datetime_skeletons:
skeleton = match_skeleton(skeleton, locale.datetime_skeletons)
skeleton = match_skeleton(skeleton, locale.datetime_skeletons) or skeleton
format = locale.datetime_skeletons[skeleton]
return format_datetime(datetime, format, tzinfo, locale)

Expand Down
4 changes: 4 additions & 0 deletions tests/test_dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,10 @@ def test_format_skeleton(timezone_getter):
assert (dates.format_skeleton('EHm', dt, locale='en') == 'Sun 15:30')
assert (dates.format_skeleton('EHm', dt, tzinfo=timezone_getter('Asia/Bangkok'), locale='th') == 'อา. 22:30 น.')

# fuzzy=True with no close match should raise KeyError with the original skeleton, not None
with pytest.raises(KeyError, match='G'):
dates.format_skeleton('G', datetime(2012, 1, 1, 14, 30, 59), locale='cs_CZ', fuzzy=True)


@pytest.mark.parametrize(('skeleton', 'expected'), [
('Hmz', 'Hmv'),
Expand Down