gh-137729: Fix support for locales with @-modifiers #137253
Merged
Conversation
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
serhiy-storchaka
force-pushed
the
locale-modifiers
branch
from
11fce5c to
853cfbd
Compare
|
Tests crash on Windows. See #137273. |
Comment on lines
487
to
491
| if modifier == 'euro' and '.' not in code: | ||
| # Assume Latin-9 for @euro locales. This is bogus, | ||
| # since some systems may use other encodings for these | ||
| # locales. Also, we ignore other modifiers. | ||
| return code, 'iso-8859-15' | ||
| # locales. | ||
| return code + '@euro', 'ISO8859-15' |
There was a problem hiding this comment.
This may be a dead code, because normalize() above adds encoding.
serhiy-storchaka
force-pushed
the
locale-modifiers
branch
from
1013430 to
abcbb93
Compare
malemburg
approved these changes
Aug 3, 2025
There was a problem hiding this comment.
A few small change requests, but otherwise this looks good. Thanks, @serhiy-storchaka
Lib/locale.py
Outdated
| code, modifier = code.split('@', 1) | ||
| if modifier == 'euro' and '.' not in code: | ||
| # Assume Latin-9 for @euro locales. This is bogus, | ||
| # since some systems may use other encodings for these |
There was a problem hiding this comment.
Please rewrite the comment to:
# Assume ISO8859-15 for @euro locales. Do note that some systems
# may use other encodings for these locales, so this may not always
# be correct.
| if modifier == 'euro': | ||
| if '.' not in code: | ||
| return code + '.ISO8859-15' | ||
| return code + '.ISO8859-15@euro' |
There was a problem hiding this comment.
Please add a comment to this section stating that Linux appears to require keeping the "@euro" modifier in place, even when using the ".ISO8859-15" encoding.
| # Ignore one letter locale mappings (except for 'c') | ||
| if len(locale) == 1 and locale != 'c': | ||
| continue | ||
| if '@' in locale and '@' not in alias: |
There was a problem hiding this comment.
Please add a comment explaining why this is done (to make glibc on Linux happy)
serhiy-storchaka
changed the title
|
@malemburg, please look at this PR again. I added documentation and comments as you suggested. |
malemburg
approved these changes
Aug 15, 2025
|
Agent-Hellboy
pushed a commit
to Agent-Hellboy/cpython
that referenced
this pull request
Aug 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.