From bb8cb7ae7d1f8bcb233ae054b16cd703e0f9b923 Mon Sep 17 00:00:00 2001 From: Yotam Nachum Date: Sat, 29 Jan 2022 17:08:38 +0200 Subject: [PATCH] Remove Python 2 imports fallback --- setup.py | 23 ++++------------------- tests/test_core.py | 5 +---- tests/test_pep503_page_parser.py | 5 +---- tests/test_rpc.py | 5 +---- 4 files changed, 7 insertions(+), 31 deletions(-) diff --git a/setup.py b/setup.py index 93f4342..7a479fb 100755 --- a/setup.py +++ b/setup.py @@ -10,25 +10,10 @@ import subprocess import hashlib from collections import namedtuple from functools import partial -try: - from io import BytesIO -except: - try: - from cStringIO import StringIO as BytesIO - except: - from StringIO import StringIO as BytesIO -try: - from urllib.request import urlopen, Request -except: - from urllib2 import urlopen, Request -try: - from urllib.parse import urljoin, urlparse, urlunparse -except: - from urlparse import urljoin, urlparse, urlunparse -try: - from html.parser import HTMLParser -except: - from HTMLParser import HTMLParser +from io import BytesIO +from urllib.request import urlopen +from urllib.parse import urljoin, urlparse, urlunparse +from html.parser import HTMLParser from setuptools import setup from setuptools.command.build_ext import build_ext diff --git a/tests/test_core.py b/tests/test_core.py index ae63519..954c628 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -1,10 +1,7 @@ import sys import threading import time -try: - import unittest2 as unittest -except: - import unittest +import unittest import frida diff --git a/tests/test_pep503_page_parser.py b/tests/test_pep503_page_parser.py index 8eff8ef..f50b578 100644 --- a/tests/test_pep503_page_parser.py +++ b/tests/test_pep503_page_parser.py @@ -1,8 +1,5 @@ import sys -try: - import unittest2 as unittest -except: - import unittest +import unittest import setup diff --git a/tests/test_rpc.py b/tests/test_rpc.py index 9108901..f8a8dfa 100644 --- a/tests/test_rpc.py +++ b/tests/test_rpc.py @@ -3,10 +3,7 @@ import subprocess import sys import threading import time -try: - import unittest2 as unittest -except: - import unittest +import unittest import frida