summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAarni Koskela <akx@iki.fi>2022-07-13 14:24:40 +0300
committerAarni Koskela <akx@iki.fi>2022-07-13 14:24:40 +0300
commit680a2f273e2794b6a5a42f814bb962b1f8fc6d32 (patch)
tree26b7c507db3b366b0fcbf2fe3f21ee46ac5b7803
parent558f26c8a9451c012e1b64be34f0b14815816127 (diff)
downloadbabel-680a2f273e2794b6a5a42f814bb962b1f8fc6d32.tar.gz
Remove some deprecated ImportError guards
-rw-r--r--babel/localtime/_win32.py7
-rwxr-xr-xscripts/download_import_cldr.py5
-rwxr-xr-xscripts/import_cldr.py5
3 files changed, 4 insertions, 13 deletions
diff --git a/babel/localtime/_win32.py b/babel/localtime/_win32.py
index 65cc088..09b87b1 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 5739cc8..19aa442 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 dbeb1b6..7fc8538 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(