[Python-checkins] cpython: Issue #20079: makelocalealias.py now supports installed SUPPORTED file,
serhiy.storchaka
python-checkins at python.org
Thu Oct 2 09:52:52 CEST 2014
https://hg.python.org/cpython/rev/5502a82fb103
changeset: 92751:5502a82fb103
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Oct 02 10:38:12 2014 +0300
summary:
Issue #20079: makelocalealias.py now supports installed SUPPORTED file,
not only source SUPPORTED file in glibc sources tree.
files:
Tools/i18n/makelocalealias.py | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Tools/i18n/makelocalealias.py b/Tools/i18n/makelocalealias.py
--- a/Tools/i18n/makelocalealias.py
+++ b/Tools/i18n/makelocalealias.py
@@ -10,8 +10,10 @@
import sys
_locale = locale
-# Location of the alias file
+# Location of the X11 alias file.
LOCALE_ALIAS = '/usr/share/X11/locale/locale.alias'
+# Location of the glibc SUPPORTED locales file.
+SUPPORTED = '/usr/share/i18n/SUPPORTED'
def parse(filename):
@@ -59,10 +61,12 @@
continue
if line[:1] == '#':
continue
- if '/' not in line:
+ line = line.replace('/', ' ').strip()
+ line = line.rstrip('\\').rstrip()
+ words = line.split()
+ if len(words) != 2:
continue
- line = line.rstrip('\\').rstrip()
- alias, _, alias_encoding = line.partition('/')
+ alias, alias_encoding = words
# Lower-case locale
locale = alias.lower()
# Normalize encoding, if given
@@ -125,13 +129,13 @@
parser.add_argument('--locale-alias', default=LOCALE_ALIAS,
help='location of the X11 alias file '
'(default: %a)' % LOCALE_ALIAS)
- parser.add_argument('--glibc-supported',
- help='location of the glibc SUPPORTED locales file')
+ parser.add_argument('--glibc-supported', default=SUPPORTED,
+ help='location of the glibc SUPPORTED locales file '
+ '(default: %a)' % SUPPORTED)
args = parser.parse_args()
data = locale.locale_alias.copy()
- if args.glibc_supported:
- data.update(parse_glibc_supported(args.glibc_supported))
+ data.update(parse_glibc_supported(args.glibc_supported))
data.update(parse(args.locale_alias))
while True:
# Repeat optimization while the size is decreased.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list