aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-09-23 21:38:33 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-09-23 21:38:33 -0400
commit977b6454345df8dfc4f9477c5d0f6a45c3e31c02 (patch)
tree799d8b510ef892e332d39927dd973a90ff48f3ba
parentce3c43cbd5e2c08ec63e6765fca8c590dd4df2b4 (diff)
parent1ed46282652e83edc8b88f64a279aacee182553d (diff)
downloadexternal_python_setuptools-977b6454345df8dfc4f9477c5d0f6a45c3e31c02.tar.gz
external_python_setuptools-977b6454345df8dfc4f9477c5d0f6a45c3e31c02.tar.bz2
external_python_setuptools-977b6454345df8dfc4f9477c5d0f6a45c3e31c02.zip
Merged in rigemo/setuptools/patch1 (pull request #18)
Bug Correction: Avoid double execution when the application throws NameError exception.
-rw-r--r--setuptools/script template (dev).py8
1 files changed, 5 insertions, 3 deletions
diff --git a/setuptools/script template (dev).py b/setuptools/script template (dev).py
index 901790e7..b3fe209e 100644
--- a/setuptools/script template (dev).py
+++ b/setuptools/script template (dev).py
@@ -1,9 +1,11 @@
# EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r
__requires__ = """%(spec)r"""
-from pkg_resources import require; require("""%(spec)r""")
+import sys
+from pkg_resources import require
+require("""%(spec)r""")
del require
__file__ = """%(dev_path)r"""
-try:
+if sys.version_info < (3, 0):
execfile(__file__)
-except NameError:
+else:
exec(compile(open(__file__).read(), __file__, 'exec'))