diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-08-01 15:36:08 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-08-01 15:36:08 -0400 |
| commit | 59e3528c710363e167e0860aab4fd1a611cc058b (patch) | |
| tree | e3d2b3b4ae943da59c67cc4c7090c519771cdffa | |
| parent | 249e5853496ec108dc78e58c003bf46315b50ffc (diff) | |
| download | python-setuptools-git-59e3528c710363e167e0860aab4fd1a611cc058b.tar.gz | |
Correct execfile implementation for Python 2.6. Fixes #236.
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | setuptools.egg-info/entry_points.txt | 2 | ||||
| -rwxr-xr-x | setuptools/sandbox.py | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 107aa093..bb5dc66f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,12 @@ CHANGES ======= ----- +5.4.2 +----- + +* Issue #236: Corrected regression in execfile implementation for Python 2.6. + +----- 5.4.1 ----- diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt index 25a8e1c3..de842da8 100644 --- a/setuptools.egg-info/entry_points.txt +++ b/setuptools.egg-info/entry_points.txt @@ -1,6 +1,6 @@ [console_scripts] easy_install = setuptools.command.easy_install:main -easy_install-2.6 = setuptools.command.easy_install:main +easy_install-3.4 = setuptools.command.easy_install:main [distutils.commands] alias = setuptools.command.alias:alias diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py index a0d3dc61..e79a13a8 100755 --- a/setuptools/sandbox.py +++ b/setuptools/sandbox.py @@ -31,6 +31,10 @@ def _execfile(filename, globals, locals=None): Python 3 implementation of execfile. """ mode = 'rb' + # Python 2.6 compile requires LF for newlines, so use deprecated + # Universal newlines support. + if sys.version_info < (2, 7): + mode += 'U' with open(filename, mode) as stream: script = stream.read() if locals is None: |