Browse Source

Check the Python version explicitly.

master
poikilos 2 years ago
parent
commit
51a5a5b267
  1. 3
      setup.py
  2. 12
      utilities/enissue.py

3
setup.py

@ -12,10 +12,9 @@ import os
# https://github.com/poikilos/pypicolcd/blob/master/setup.py # https://github.com/poikilos/pypicolcd/blob/master/setup.py
# - For nose, see https://github.com/poikilos/mgep/blob/master/setup.py # - For nose, see https://github.com/poikilos/mgep/blob/master/setup.py
# python_mr = sys.version_info.major
# versionedModule = {} # versionedModule = {}
# versionedModule['urllib'] = 'urllib' # versionedModule['urllib'] = 'urllib'
# if python_mr == 2: # if sys.version_info.major < 3:
# versionedModule['urllib'] = 'urllib2' # versionedModule['urllib'] = 'urllib2'
install_requires = [] install_requires = []

12
utilities/enissue.py

@ -48,18 +48,16 @@ import os
import platform import platform
import copy import copy
from datetime import datetime, timedelta from datetime import datetime, timedelta
python_mr = sys.version_info.major if sys.version_info.major >= 3:
try:
import urllib.request import urllib.request
request = urllib.request request = urllib.request
except ImportError: else:
# python2 # python2
# python_mr = 2 print("* detected Python " + str(sys.version_info.major))
print("* detected Python " + str(python_mr))
import urllib2 as urllib import urllib2 as urllib
request = urllib request = urllib
try: if sys.version_info.major >= 3:
from urllib.parse import urlparse from urllib.parse import urlparse
# from urllib.parse import quote_plus # from urllib.parse import quote_plus
from urllib.parse import urlencode from urllib.parse import urlencode
@ -73,7 +71,7 @@ try:
" requests package for python3 such as via:\n" " requests package for python3 such as via:\n"
" sudo apt-get install python3-requests") " sudo apt-get install python3-requests")
sys.stderr.flush() sys.stderr.flush()
except ImportError: else:
# Python 2 # Python 2
# See <https://docs.python.org/2/howto/urllib2.html> # See <https://docs.python.org/2/howto/urllib2.html>
from urlparse import urlparse from urlparse import urlparse

Loading…
Cancel
Save