From 7b2f1a713b39a47ea87786a8dfa8b22e9d28d252 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Thu, 5 Sep 2019 09:49:41 -0300 Subject: [PATCH] Remove more Python 2 fallback imports --- ubuntutools/lp/libsupport.py | 7 +------ ubuntutools/sponsor_patch/bugtask.py | 7 ++----- ubuntutools/test/test_archive.py | 12 ++++-------- ubuntutools/test/test_config.py | 10 +++------- ubuntutools/test/test_logger.py | 5 +---- ubuntutools/test/test_update_maintainer.py | 9 ++------- 6 files changed, 13 insertions(+), 37 deletions(-) diff --git a/ubuntutools/lp/libsupport.py b/ubuntutools/lp/libsupport.py index 64f3cf4..24b1d3c 100644 --- a/ubuntutools/lp/libsupport.py +++ b/ubuntutools/lp/libsupport.py @@ -18,12 +18,7 @@ # the GNU General Public License license. # -# Modules. -try: - from urllib.parse import urlsplit, urlencode, urlunsplit -except ImportError: - from urllib import urlencode - from urlparse import urlsplit, urlunsplit +from urllib.parse import urlsplit, urlencode, urlunsplit def query_to_dict(query_string): diff --git a/ubuntutools/sponsor_patch/bugtask.py b/ubuntutools/sponsor_patch/bugtask.py index ebb40f6..c641145 100644 --- a/ubuntutools/sponsor_patch/bugtask.py +++ b/ubuntutools/sponsor_patch/bugtask.py @@ -17,11 +17,8 @@ import os import re -try: - from urllib.parse import unquote - from urllib.request import urlretrieve -except ImportError: - from urllib import unquote, urlretrieve +from urllib.parse import unquote +from urllib.request import urlretrieve import debian.debian_support import distro_info diff --git a/ubuntutools/test/test_archive.py b/ubuntutools/test/test_archive.py index 5be8aaa..aa8c372 100644 --- a/ubuntutools/test/test_archive.py +++ b/ubuntutools/test/test_archive.py @@ -15,20 +15,16 @@ # PERFORMANCE OF THIS SOFTWARE. +import mock import os.path import shutil import tempfile from io import BytesIO -try: - from urllib.request import OpenerDirector, urlopen - from urllib.error import HTTPError, URLError -except ImportError: - from urllib2 import OpenerDirector, urlopen - from urllib2 import HTTPError, URLError -import httplib2 -import mock +from urllib.error import HTTPError, URLError +from urllib.request import OpenerDirector, urlopen import debian.deb822 +import httplib2 import ubuntutools.archive from ubuntutools.test import unittest diff --git a/ubuntutools/test/test_config.py b/ubuntutools/test/test_config.py index b4f4c43..08b37fb 100644 --- a/ubuntutools/test/test_config.py +++ b/ubuntutools/test/test_config.py @@ -15,15 +15,11 @@ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +import locale +import mock import os import sys -import locale -try: - from StringIO import StringIO -except ImportError: - from io import StringIO - -import mock +from io import StringIO from ubuntutools.config import UDTConfig, ubu_email from ubuntutools.logger import Logger diff --git a/ubuntutools/test/test_logger.py b/ubuntutools/test/test_logger.py index 6593646..3f7fec3 100644 --- a/ubuntutools/test/test_logger.py +++ b/ubuntutools/test/test_logger.py @@ -14,10 +14,7 @@ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -try: - from StringIO import StringIO -except ImportError: - from io import StringIO +from io import StringIO import sys from ubuntutools.logger import Logger diff --git a/ubuntutools/test/test_update_maintainer.py b/ubuntutools/test/test_update_maintainer.py index 0bf3336..bd5d567 100644 --- a/ubuntutools/test/test_update_maintainer.py +++ b/ubuntutools/test/test_update_maintainer.py @@ -16,15 +16,10 @@ """Test suite for ubuntutools.update_maintainer""" -try: - from StringIO import StringIO -except ImportError: - from io import StringIO - +import mock import os import sys - -import mock +from io import StringIO from ubuntutools.logger import Logger from ubuntutools.test import unittest