changeset:   92750:aa169e6d2e15
parent:      92745:565d21b555ad
parent:      92749:ed92f06cdd8b
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Thu Oct 02 10:21:43 2014 +0300
files:       Tools/i18n/makelocalealias.py
description:
Issue #20076: Apply optimization in makelocalealias.py repeatedly.

Remove just added the sr_rs.utf8@latn alias because it is
derived from sr_rs@latin.


diff -r 565d21b555ad -r aa169e6d2e15 Lib/locale.py
--- a/Lib/locale.py	Thu Oct 02 08:39:01 2014 +0200
+++ b/Lib/locale.py	Thu Oct 02 10:21:43 2014 +0300
@@ -1264,7 +1264,6 @@
     'sr_cs@latn':                           'sr_CS.UTF-8@latin',
     'sr_me':                                'sr_ME.UTF-8',
     'sr_rs':                                'sr_RS.UTF-8',
-    'sr_rs.utf8@latn':                      'sr_RS.UTF-8@latin',
     'sr_rs@latn':                           'sr_RS.UTF-8@latin',
     'sr_sp':                                'sr_CS.ISO8859-2',
     'sr_yu':                                'sr_RS.UTF-8@latin',
diff -r 565d21b555ad -r aa169e6d2e15 Tools/i18n/makelocalealias.py
--- a/Tools/i18n/makelocalealias.py	Thu Oct 02 08:39:01 2014 +0200
+++ b/Tools/i18n/makelocalealias.py	Thu Oct 02 10:21:43 2014 +0300
@@ -133,7 +133,12 @@
     if args.glibc_supported:
         data.update(parse_glibc_supported(args.glibc_supported))
     data.update(parse(args.locale_alias))
-    data = optimize(data)
+    while True:
+        # Repeat optimization while the size is decreased.
+        n = len(data)
+        data = optimize(data)
+        if len(data) == n:
+            break
     print_differences(data, locale.locale_alias)
     print()
     print('locale_alias = {')