diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-07-05 12:07:21 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-07-05 12:07:21 -0400 |
| commit | e88bff90bfb1d1ac9ecfcf31eeae11faf50cf936 (patch) | |
| tree | 73146db84f1d6bdd452737effb6ee2194d8bec3a | |
| parent | bd7e1edff511c8410acfb640d005502d66910b41 (diff) | |
| parent | 04ee0d93a95c9b5f8c856856040d477647d1244d (diff) | |
| download | python-setuptools-git-e88bff90bfb1d1ac9ecfcf31eeae11faf50cf936.tar.gz | |
Merge with master
--HG--
extra : amend_source : 272b2718bac5934550a589d08f584120ba78086a
| -rw-r--r-- | setuptools/script (dev).tmpl | 7 | ||||
| -rw-r--r-- | setuptools/script.tmpl | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/setuptools/script (dev).tmpl b/setuptools/script (dev).tmpl index c476673f..6b1bef5b 100644 --- a/setuptools/script (dev).tmpl +++ b/setuptools/script (dev).tmpl @@ -1,11 +1,8 @@ # EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r __requires__ = %(spec)r -import sys -from pkg_resources import require -require(%(spec)r) -del require +__import__('pkg_resources').require(%(spec)r) __file__ = %(dev_path)r -if sys.version_info < (3, 0): +if __import__('sys').version_info < (3, 0): execfile(__file__) else: exec(compile(open(__file__).read(), __file__, 'exec')) diff --git a/setuptools/script.tmpl b/setuptools/script.tmpl index 4504e264..ff5efbca 100644 --- a/setuptools/script.tmpl +++ b/setuptools/script.tmpl @@ -1,4 +1,3 @@ # EASY-INSTALL-SCRIPT: %(spec)r,%(script_name)r __requires__ = %(spec)r -import pkg_resources -pkg_resources.run_script(%(spec)r, %(script_name)r) +__import__('pkg_resources').run_script(%(spec)r, %(script_name)r) |