diff --git a/setup.py b/setup.py index fef789d..2d3311b 100644 --- a/setup.py +++ b/setup.py @@ -12,10 +12,9 @@ import os # https://github.com/poikilos/pypicolcd/blob/master/setup.py # - For nose, see https://github.com/poikilos/mgep/blob/master/setup.py -# python_mr = sys.version_info.major # versionedModule = {} # versionedModule['urllib'] = 'urllib' -# if python_mr == 2: +# if sys.version_info.major < 3: # versionedModule['urllib'] = 'urllib2' install_requires = [] diff --git a/utilities/enissue.py b/utilities/enissue.py index b901fa2..00c16d0 100755 --- a/utilities/enissue.py +++ b/utilities/enissue.py @@ -48,18 +48,16 @@ import os import platform import copy from datetime import datetime, timedelta -python_mr = sys.version_info.major -try: +if sys.version_info.major >= 3: import urllib.request request = urllib.request -except ImportError: +else: # python2 - # python_mr = 2 - print("* detected Python " + str(python_mr)) + print("* detected Python " + str(sys.version_info.major)) import urllib2 as urllib request = urllib -try: +if sys.version_info.major >= 3: from urllib.parse import urlparse # from urllib.parse import quote_plus from urllib.parse import urlencode @@ -73,7 +71,7 @@ try: " requests package for python3 such as via:\n" " sudo apt-get install python3-requests") sys.stderr.flush() -except ImportError: +else: # Python 2 # See from urlparse import urlparse