Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jun 25, 2015
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pyminifier/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
13 changes: 7 additions & 6 deletions pyminifier/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
"""
Expand Down
2 changes: 1 addition & 1 deletion pyminifier/analyze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions pyminifier/compression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
5 changes: 3 additions & 2 deletions pyminifier/obfuscate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down