[Python-checkins] cpython (merge 3.4 -> default): Issue #20076: Apply optimization in makelocalealias.py repeatedly.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/aa169e6d2e15
changeset:   92750:aa169e6d2e15
parent:      92745:565d21b555ad
parent:      92749:ed92f06cdd8b
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Thu Oct 02 10:21:43 2014 +0300
summary:
  Issue #20076: Apply optimization in makelocalealias.py repeatedly.

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

files:
  Lib/locale.py                 |  1 -
  Tools/i18n/makelocalealias.py |  7 ++++++-
  2 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Lib/locale.py b/Lib/locale.py
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -1264,7 +1264,6 @@
     'sr_cs at latn':                           'sr_CS.UTF-8 at latin',
     'sr_me':                                'sr_ME.UTF-8',
     'sr_rs':                                'sr_RS.UTF-8',
-    'sr_rs.utf8 at latn':                      'sr_RS.UTF-8 at latin',
     'sr_rs at latn':                           'sr_RS.UTF-8 at latin',
     'sr_sp':                                'sr_CS.ISO8859-2',
     'sr_yu':                                'sr_RS.UTF-8 at latin',
diff --git a/Tools/i18n/makelocalealias.py b/Tools/i18n/makelocalealias.py
--- a/Tools/i18n/makelocalealias.py
+++ b/Tools/i18n/makelocalealias.py
@@ -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 = {')

-- 
Repository URL: https://hg.python.org/cpython