diff --git a/pyminifier/__init__.py b/pyminifier/__init__.py index 0e61063..63f7ccd 100644 --- a/pyminifier/__init__.py +++ b/pyminifier/__init__.py @@ -68,7 +68,7 @@ # Import built-in modules import os, sys, re, io from optparse import OptionParser -from collections import Iterable +from collections.abc import Iterable # Import our own modules from . import minification diff --git a/pyminifier/analyze.py b/pyminifier/analyze.py index e1968d8..c853521 100644 --- a/pyminifier/analyze.py +++ b/pyminifier/analyze.py @@ -6,10 +6,7 @@ # Import builtins import os, sys, re, tokenize, keyword -try: - import cStringIO as io -except ImportError: # Ahh, Python 3 - import io +import io # Globals py3 = False diff --git a/pyminifier/minification.py b/pyminifier/minification.py index 915337c..54e4131 100644 --- a/pyminifier/minification.py +++ b/pyminifier/minification.py @@ -6,10 +6,7 @@ # Import built-in modules import re, tokenize, keyword -try: - import cStringIO as io -except ImportError: # We're using Python 3 - import io +import io # Import our own modules from . import analyze, token_utils diff --git a/pyminifier/obfuscate.py b/pyminifier/obfuscate.py index a54455a..7c15a6d 100755 --- a/pyminifier/obfuscate.py +++ b/pyminifier/obfuscate.py @@ -13,12 +13,9 @@ from . import analyze from . import token_utils -if not isinstance(sys.version_info, tuple): - if sys.version_info.major == 3: - unichr = chr # So we can support both 2 and 3 try: - unichr(0x10000) # Will throw a ValueError on narrow Python builds + chr(0x10000) # Will throw a ValueError on narrow Python builds HIGHEST_UNICODE = 0x10FFFF # 1114111 except: HIGHEST_UNICODE = 0xFFFF # 65535 diff --git a/pyminifier/token_utils.py b/pyminifier/token_utils.py index 577b174..c7afa4c 100644 --- a/pyminifier/token_utils.py +++ b/pyminifier/token_utils.py @@ -6,10 +6,7 @@ """ import tokenize -try: - import cStringIO as io -except ImportError: # We're using Python 3 - import io +import io def untokenize(tokens): """ diff --git a/setup.py b/setup.py index 65d80fb..62bbaaf 100755 --- a/setup.py +++ b/setup.py @@ -1,12 +1,6 @@ import sys import pyminifier from setuptools import setup -from distutils.command.install import INSTALL_SCHEMES - -for scheme in INSTALL_SCHEMES.values(): - scheme['data'] = scheme['purelib'] - -extra = {} if isinstance(sys.version_info, tuple): major = sys.version_info[0] @@ -14,27 +8,14 @@ major = sys.version_info.major if major == 2: - from distutils.command.build_py import build_py -elif major == 3: - extra['use_2to3'] = True # Automatically convert to Python 3; love it! - try: - from distutils.command.build_py import build_py_2to3 as build_py - except ImportError: - print("Python 3.X support requires the 2to3 tool.") - print( - "It normally comes with Python 3.X but (apparenty) not on your " - "distribution.\nPlease find out what package you need to get 2to3" - "and install it.") - sys.exit(1) - -cmdclass = {'build_py': build_py} + print("Python 2 is no longer supported.") + sys.exit(1) setup( name="pyminifier", version=pyminifier.__version__, description="Python code minifier, obfuscator, and compressor", author=pyminifier.__author__, - cmdclass=cmdclass, author_email="daniel.mcdougall@liftoffsoftware.com", url="https://github.com/liftoff/pyminifier", license="Proprietary", @@ -63,5 +44,4 @@ ], }, test_suite = "tests", - **extra )