diff options
| -rw-r--r-- | setuptools.egg-info/entry_points.txt | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_sandbox.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt index de842da8..25a8e1c3 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-3.4 = setuptools.command.easy_install:main +easy_install-2.6 = setuptools.command.easy_install:main [distutils.commands] alias = setuptools.command.alias:alias diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py index 0f2e693d..6a890ebc 100644 --- a/setuptools/tests/test_sandbox.py +++ b/setuptools/tests/test_sandbox.py @@ -73,5 +73,11 @@ class TestSandbox(unittest.TestCase): setuptools.sandbox._execfile(target, vars(namespace)) assert namespace.result == 'passed' + def test_setup_py_with_CRLF(self): + setup_py = os.path.join(self.dir, 'setup.py') + with open(setup_py, 'wb') as stream: + stream.write(b'"degenerate script"\r\n') + setuptools.sandbox._execfile(setup_py, globals()) + if __name__ == '__main__': unittest.main() |