# HG changeset patch # User fschwarz # Date 1343118014 0 # Node ID 8ce41e60f90d9c64f5f1e7508225a1da7bd01894 # Parent 99c48a6ca1d65241a480fbf984f7b0fd34c19ec7 remove ElementTree import from babel.compat as this introduces a new (unnecessary) dependency for Python 2.4 users diff --git a/babel/compat.py b/babel/compat.py --- a/babel/compat.py +++ b/babel/compat.py @@ -12,11 +12,6 @@ # history and logs, available at http://babel.edgewall.org/log/. try: - from xml.etree import ElementTree -except ImportError: - from elementtree import ElementTree - -try: any = any except NameError: def any(iterable): diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py --- a/scripts/import_cldr.py +++ b/scripts/import_cldr.py @@ -17,12 +17,18 @@ import os import re import sys +# don't put the ElementTree import in babel/compat.py as this will add a new +# dependency (elementtree) for Python 2.4 users. +try: + from xml.etree import ElementTree +except ImportError: + from elementtree import ElementTree # 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.compat import any from babel.plural import PluralRule from babel.localedata import Alias