diff options
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 84769034..542424d1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,12 @@ CHANGES ======= ------ +0.6.17 +------ + +* Support Python >=3.1.4 and >=3.2.1. + +------ 0.6.16 ------ diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index fb0f9979..58e7ab39 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1590,6 +1590,11 @@ class PthDistributions(Environment): def get_script_header(script_text, executable=sys_executable, wininst=False): """Create a #! line, getting options (if any) from script_text""" from distutils.command.build_scripts import first_line_re + + # first_line_re in Python >=3.1.4 and >=3.2.1 is a bytes pattern. + if not isinstance(first_line_re.pattern, str): + first_line_re = re.compile(first_line_re.pattern.decode()) + first = (script_text+'\n').splitlines()[0] match = first_line_re.match(first) options = '' |