diff scripts/import_cldr.py @ 567:c81a11cb1476 trunk

add a compat module to shield the code from changes in different versions of Python
author fschwarz
date Mon, 26 Sep 2011 09:42:43 +0000
parents 1de26da5aa25
children 8ce41e60f90d
line wrap: on
line diff
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -17,27 +17,19 @@
 import os
 import re
 import sys
-try:
-    from xml.etree.ElementTree import parse
-except ImportError:
-    from elementtree.ElementTree import parse
 
 # Make sure we're using Babel source, and not some previously installed version
 sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), '..'))
 
 from babel import dates, numbers
+from babel.compat import any, ElementTree
 from babel.plural import PluralRule
 from babel.localedata import Alias
 
+parse = ElementTree.parse
 weekdays = {'mon': 0, 'tue': 1, 'wed': 2, 'thu': 3, 'fri': 4, 'sat': 5,
             'sun': 6}
 
-try:
-    any
-except NameError:
-    def any(iterable):
-        return filter(None, list(iterable))
-
 
 def _text(elem):
     buf = [elem.text or '']
Copyright (C) 2012-2017 Edgewall Software