Merge pull request #39 from MoshiBin/master

Fix pyminifier on Python 2.6 by always checking that sys.version_info is not a tuple

pyminifier/__init__.py

@@ -78,12 +78,13 @@
 
 py3 = False
 lzma = False
-if sys.version_info.major == 3:
-    py3 = True
-    try:
-        import lzma
-    except ImportError:
-        pass
+if not isinstance(sys.version_info, tuple):
+    if sys.version_info.major == 3:
+        py3 = True
+        try:
+            import lzma
+        except ImportError:
+            pass
 
 # Regexes
 multiline_indicator = re.compile('\\\\(\s*#.*)?\n')

pyminifier/__main__.py

@@ -6,12 +6,13 @@
 
 py3 = False
 lzma = False
-if sys.version_info.major == 3:
-    py3 = True
-    try:
-        import lzma
-    except ImportError:
-        pass
+if not isinstance(sys.version_info, tuple):
+    if sys.version_info.major == 3:
+        py3 = True
+        try:
+            import lzma
+        except ImportError:
+            pass
 
 def main():
     """

pyminifier/analyze.py

@@ -14,7 +14,7 @@
 # Globals
 py3 = False
 
-if not isinstance(sys.version_info.major, tuple):
+if not isinstance(sys.version_info, tuple):
     if sys.version_info.major == 3:
         py3 = True
 

pyminifier/compression.py

@@ -44,8 +44,9 @@
 from . import analyze, token_utils, minification, obfuscate
 
 py3 = False
-if sys.version_info.major == 3:
-    py3 = True
+if not isinstance(sys.version_info, tuple):
+    if sys.version_info.major == 3:
+        py3 = True
 
 def bz2_pack(source):
     """

pyminifier/obfuscate.py

@@ -13,8 +13,9 @@
 from . import analyze
 from . import token_utils
 
-if sys.version_info.major == 3:
-    unichr = chr # So we can support both 2 and 3
+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