Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-10 16:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove more Python 2 fallback imports

Browse Source
This commit is contained in:
Stefano Rivera 2019-09-05 09:49:41 -03:00
parent 8bdf4f839a
commit 7b2f1a713b
6 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ubuntutools/lp/libsupport.py
View File

@ -18,12 +18,7 @@
# the GNU General Public License license. # the GNU General Public License license.
# #
# Modules.
try:
from urllib.parse import urlsplit, urlencode, urlunsplit from urllib.parse import urlsplit, urlencode, urlunsplit
except ImportError:
from urllib import urlencode
from urlparse import urlsplit, urlunsplit
def query_to_dict(query_string): def query_to_dict(query_string):

3
ubuntutools/sponsor_patch/bugtask.py
View File

@ -17,11 +17,8 @@
import os import os
import re import re
try:
from urllib.parse import unquote from urllib.parse import unquote
from urllib.request import urlretrieve from urllib.request import urlretrieve
except ImportError:
from urllib import unquote, urlretrieve
import debian.debian_support import debian.debian_support
import distro_info import distro_info

10
ubuntutools/test/test_archive.py
View File

@ -15,20 +15,16 @@
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
import mock
import os.path import os.path
import shutil import shutil
import tempfile import tempfile
from io import BytesIO from io import BytesIO
try:
from urllib.request import OpenerDirector, urlopen
from urllib.error import HTTPError, URLError from urllib.error import HTTPError, URLError
except ImportError: from urllib.request import OpenerDirector, urlopen
from urllib2 import OpenerDirector, urlopen
from urllib2 import HTTPError, URLError
import httplib2
import mock
import debian.deb822 import debian.deb822
import httplib2
import ubuntutools.archive import ubuntutools.archive
from ubuntutools.test import unittest from ubuntutools.test import unittest

8
ubuntutools/test/test_config.py
View File

@ -15,16 +15,12 @@
# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
import locale
import mock
import os import os
import sys import sys
import locale
try:
from StringIO import StringIO
except ImportError:
from io import StringIO from io import StringIO
import mock
from ubuntutools.config import UDTConfig, ubu_email from ubuntutools.config import UDTConfig, ubu_email
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools.test import unittest from ubuntutools.test import unittest

3
ubuntutools/test/test_logger.py
View File

@ -14,9 +14,6 @@
# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
try:
from StringIO import StringIO
except ImportError:
from io import StringIO from io import StringIO
import sys import sys

9
ubuntutools/test/test_update_maintainer.py
View File

@ -16,15 +16,10 @@
"""Test suite for ubuntutools.update_maintainer""" """Test suite for ubuntutools.update_maintainer"""
try: import mock
from StringIO import StringIO
except ImportError:
from io import StringIO
import os import os
import sys import sys
from io import StringIO
import mock
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools.test import unittest from ubuntutools.test import unittest