aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>2014-06-30 13:30:09 +0200
committerArfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>2014-06-30 13:30:09 +0200
commit04ee0d93a95c9b5f8c856856040d477647d1244d (patch)
tree9430c4a9788112d59081370e26fc042918d70400
parent4acb16a206bb4467663a2e0dcd024cbdc6a5c649 (diff)
downloadexternal_python_setuptools-04ee0d93a95c9b5f8c856856040d477647d1244d.tar.gz
external_python_setuptools-04ee0d93a95c9b5f8c856856040d477647d1244d.tar.bz2
external_python_setuptools-04ee0d93a95c9b5f8c856856040d477647d1244d.zip
Use __import__() to avoid leaking imported names to the executed script.
-rw-r--r--setuptools/script (dev).tmpl7
-rw-r--r--setuptools/script.tmpl3
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)