summaryrefslogtreecommitdiffstats
path: root/Tools/i18n
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2017-03-20 06:49:43 (GMT)
committerGitHub <noreply@github.com>2017-03-20 06:49:43 (GMT)
commitdf8280838f52d6ec45ba03ef734b0dec8a9c43fb (patch)
treede6f73d23e5ef14e39efc77768cfe19e03c60a74 /Tools/i18n
parente46fb8611867fa3b407a813f53137929b7cb4a10 (diff)
downloadcpython-df8280838f52d6ec45ba03ef734b0dec8a9c43fb.zip
cpython-df8280838f52d6ec45ba03ef734b0dec8a9c43fb.tar.gz
cpython-df8280838f52d6ec45ba03ef734b0dec8a9c43fb.tar.bz2
bpo-20087: Revert "make the glibc alias table take precedence over the X11 one (#422)" (#713)
This reverts commit 02371e0ed1ee82ec73e7d363bcf2ed40cde1397a.
Diffstat (limited to 'Tools/i18n')
-rwxr-xr-xTools/i18n/makelocalealias.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/i18n/makelocalealias.py b/Tools/i18n/makelocalealias.py
index 7405e82..c7ecace 100755
--- a/Tools/i18n/makelocalealias.py
+++ b/Tools/i18n/makelocalealias.py
@@ -135,8 +135,8 @@ if __name__ == '__main__':
args = parser.parse_args()
data = locale.locale_alias.copy()
- data.update(parse(args.locale_alias))
data.update(parse_glibc_supported(args.glibc_supported))
+ data.update(parse(args.locale_alias))
while True:
# Repeat optimization while the size is decreased.
n = len(data)