Merge with master

--HG-- extra : amend_source : 272b2718bac5934550a589d08f584120ba78086a

Merge with master
--HG-- extra : amend_source : 272b2718bac5934550a589d08f584120ba78086a
e88bff90 · Jason R. Coombs · bd7e1edf · 04ee0d93 · e88bff90 · e88bff90
Commit e88bff90 authored Jul 05, 2014 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

setuptools/script (dev).tmpl setuptools/script (dev).tmpl +2 -5

setuptools/script.tmpl setuptools/script.tmpl +1 -2

No files found.
--- a/setuptools/script (dev).tmpl
+++ b/setuptools/script (dev).tmpl
 # 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'))
--- a/setuptools/script.tmpl
+++ b/setuptools/script.tmpl
 # 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)