From: Jennifer Wang <jtwang@yelp.com>
Date: Mon, 18 Apr 2016 22:30:54 +0000 (-0700)
Subject: Revert "import_cldr: if lxml is installed, use it"
X-Git-Tag: 2.3.4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d95cd14876882b4c80fc8db4dda88b09eecd4d;p=thirdparty%2Fbabel.git

Revert "import_cldr: if lxml is installed, use it"

This reverts commit 9b5c7f3678167f03ec39fd1c25f98d0e0d41621f.

Refs https://github.com/python-babel/babel/issues/391
---

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index f684de34..8de70436 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -18,12 +18,9 @@ import re
 import sys
 
 try:
-    import lxml.etree as ElementTree
+    from xml.etree import cElementTree as ElementTree
 except ImportError:
-    try:
-        from xml.etree import cElementTree as ElementTree
-    except ImportError:
-        from xml.etree import ElementTree
+    from xml.etree import ElementTree
 
 # Make sure we're using Babel source, and not some previously installed version
 CHECKOUT_ROOT = os.path.abspath(os.path.join(