aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-09-18 07:34:23 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-09-18 07:34:23 -0400
commitd1bcc3545099d652f07fc13e1cfb449d0ed87d58 (patch)
treee61feb87549e8b40f194adc3b0bc67737a0d0388
parent5d3002955232bb6a2b83faee486cd362dbbf8fa3 (diff)
downloadexternal_python_setuptools-d1bcc3545099d652f07fc13e1cfb449d0ed87d58.tar.gz
external_python_setuptools-d1bcc3545099d652f07fc13e1cfb449d0ed87d58.tar.bz2
external_python_setuptools-d1bcc3545099d652f07fc13e1cfb449d0ed87d58.zip
Remove execfile compatibility - unnecessary on Python 2.6+5.8
--HG-- extra : amend_source : 8a0dcd07e62a327647c834a44fe73b8ebc7b53b9
-rw-r--r--pkg_resources.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 825b3004..517298c9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -47,12 +47,6 @@ if PY2:
if PY3:
string_types = str,
- def execfile(fn, globs=None, locs=None):
- if globs is None:
- globs = globals()
- if locs is None:
- locs = globs
- exec(compile(open(fn).read(), fn, 'exec'), globs, locs)
else:
string_types = str, eval('unicode')
@@ -1424,7 +1418,9 @@ class NullProvider:
script_filename = self._fn(self.egg_info, script)
namespace['__file__'] = script_filename
if os.path.exists(script_filename):
- execfile(script_filename, namespace, namespace)
+ source = open(script_filename).read()
+ code = compile(source, script_filename, 'exec')
+ exec(code, namespace, namespace)
else:
from linecache import cache
cache[script_filename] = (