◐ Shell
reader mode source ↗
Skip to content

update locale aliases for glibc 2.24#422

Merged
benjaminp merged 1 commit into
masterfrom
benjamin-locale-aliases
Mar 8, 2017
Merged

update locale aliases for glibc 2.24#422
benjaminp merged 1 commit into
masterfrom
benjamin-locale-aliases

Conversation

@benjaminp

@benjaminp benjaminp commented Mar 3, 2017

Copy link
Copy Markdown
Contributor

I also made makelocalealias.py prefer the glibc defaults.

serhiy-storchaka
serhiy-storchaka requested changes Mar 3, 2017
View reviewed changes

@serhiy-storchaka serhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

This change needs an entry in Misc/NEWS. Please open an issue on the tracker for discussion and reference.

@serhiy-storchaka

serhiy-storchaka commented Mar 3, 2017

Copy link
Copy Markdown
Member

I suppose some of changes are related to bpo-20087. This was not discussed yet.

@benjaminp

benjaminp commented Mar 3, 2017

Copy link
Copy Markdown
Contributor Author

I think this is the correct fix for bpo-29571.

@benjaminp benjaminp force-pushed the benjamin-locale-aliases branch from 7d6c3b1 to 33a0ce0 Compare March 3, 2017 07:55
@ncoghlan

ncoghlan commented Mar 3, 2017

Copy link
Copy Markdown
Contributor

Aye, I never did figure out why locale.getpreferredencoding(False) and locale.getlocale(LC_CTYPE) were giving different answers - this would definitely explain it.

+1 for fixing the underlying discrepancy in 3.7+.

@benjaminp benjaminp force-pushed the benjamin-locale-aliases branch from 33a0ce0 to 4f5053a Compare March 4, 2017 07:27
@benjaminp benjaminp requested a review from malemburg March 4, 2017 07:27
@serhiy-storchaka

serhiy-storchaka commented Mar 6, 2017

Copy link
Copy Markdown
Member

@benjaminp, when you run Tools/i18n/makelocalealias.py on unmodified sources, you get also a list of modified aliases:

#    updated 'az_az' -> 'az_AZ.ISO8859-9E' to 'az_AZ.UTF-8'
#    updated 'ca_ad' -> 'ca_AD.ISO8859-1' to 'ca_AD.ISO8859-15'
#    updated 'ca_fr' -> 'ca_FR.ISO8859-1' to 'ca_FR.ISO8859-15'

It should be added to the long comment before the alias table. Only "updated" lines are needed, not "removed".

Add a comment that glibc aliases now are preferred. This is the main cause of changes.

And please add a test for en_IN.

@benjaminp benjaminp force-pushed the benjamin-locale-aliases branch from 4f5053a to 8ffe417 Compare March 7, 2017 05:42
@benjaminp
update locale aliases for glibc 2.24 …
3738b4a 
I also made makelocalealias.py prefer the glibc defaults.
@benjaminp benjaminp force-pushed the benjamin-locale-aliases branch from 8ffe417 to 3738b4a Compare March 7, 2017 05:43
@malemburg

malemburg commented Mar 7, 2017

Copy link
Copy Markdown
Member

Please see the ticket for discussion: http://bugs.python.org/issue20087

@benjaminp benjaminp merged commit 02371e0 into master Mar 8, 2017
@benjaminp benjaminp deleted the benjamin-locale-aliases branch March 8, 2017 06:04
@malemburg

malemburg commented Mar 8, 2017

Copy link
Copy Markdown
Member

This merge should be undone. The PR clearly contains bugs and also is not complete. See the ticket for discussion.

@benjaminp benjaminp mentioned this pull request Mar 19, 2017
Merged
benjaminp added a commit that referenced this pull request Mar 19, 2017
@benjaminp
bpo-20087: Revert "make the glibc alias table take precedence over th… …
65d7377 
…e X11 one (#422)"

This reverts commit 02371e0.
benjaminp added a commit that referenced this pull request Mar 20, 2017
@benjaminp
bpo-20087: Revert "make the glibc alias table take precedence over th… …
1831996 
…e X11 one (#422)"

This reverts commit 02371e0.
benjaminp added a commit that referenced this pull request Mar 20, 2017
@benjaminp
bpo-20087: Revert "make the glibc alias table take precedence over th… …
df82808 
…e X11 one (#422)" (#713)

This reverts commit 02371e0.
This was referenced Feb 13, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

@malemburg malemburg Awaiting requested review from malemburg

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@benjaminp @serhiy-storchaka @ncoghlan @malemburg @the-knights-who-say-ni