From: Aarni Koskela <akx@iki.fi>
Date: Wed, 13 Jul 2022 11:24:40 +0000 (+0300)
Subject: Remove some deprecated ImportError guards
X-Git-Tag: v2.11.0~13^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=680a2f273e2794b6a5a42f814bb962b1f8fc6d32;p=thirdparty%2Fbabel.git

Remove some deprecated ImportError guards
---

diff --git a/babel/localtime/_win32.py b/babel/localtime/_win32.py
index 65cc0885..09b87b14 100644
--- a/babel/localtime/_win32.py
+++ b/babel/localtime/_win32.py
@@ -1,10 +1,7 @@
 try:
-    import _winreg as winreg
+    import winreg
 except ImportError:
-    try:
-        import winreg
-    except ImportError:
-        winreg = None
+    winreg = None
 
 from babel.core import get_global
 import pytz
diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 5739cc84..19aa4420 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -7,10 +7,7 @@ import shutil
 import hashlib
 import zipfile
 import subprocess
-try:
-    from urllib.request import urlretrieve
-except ImportError:
-    from urllib import urlretrieve
+from urllib.request import urlretrieve
 
 
 URL = 'http://unicode.org/Public/cldr/41/cldr-common-41.0.zip'
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index dbeb1b63..7fc8538d 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -19,10 +19,7 @@ import re
 import sys
 import logging
 
-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(