diff options
| author | Ofekmeister <ofekmeister@gmail.com> | 2016-08-20 13:37:33 -0400 |
|---|---|---|
| committer | Ofekmeister <ofekmeister@gmail.com> | 2016-08-20 13:37:33 -0400 |
| commit | 735a66a5588aadcf02a10b58338d476803916b99 (patch) | |
| tree | bd91ec9e61846e41f6196b338b17e0b1123e339b /setuptools | |
| parent | 9e11ba01ef15138fc928f720967bb4899d8bde38 (diff) | |
| download | python-setuptools-git-735a66a5588aadcf02a10b58338d476803916b99.tar.gz | |
Make import unconditional
Put import on top and updated CHANGES.rst
Diffstat (limited to 'setuptools')
| -rwxr-xr-x | setuptools/command/easy_install.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index e2a7dc46..5065661f 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -2018,11 +2018,11 @@ class ScriptWriter(object): template = textwrap.dedent(""" # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r __requires__ = %(spec)r + import re import sys from pkg_resources import load_entry_point if __name__ == '__main__': - import re sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) sys.exit( load_entry_point(%(spec)r, %(group)r, %(name)r)() diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index a4b1dfd5..82e1d7e8 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -74,11 +74,11 @@ class TestEasyInstallTest: expected = header + DALS(""" # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name' __requires__ = 'spec' + import re import sys from pkg_resources import load_entry_point if __name__ == '__main__': - import re sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) sys.exit( load_entry_point('spec', 'console_scripts', 'name')() |