summaryrefslogtreecommitdiff
path: root/pkg_resources.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-11-24 16:25:01 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-11-24 16:25:01 -0500
commitf07c527906b54fa8245c6804ae8062c8ddd6c6d7 (patch)
tree22d811fafb5cadcc37aabef2b612b098d1287d82 /pkg_resources.py
parent6474847292f1cf4fcda55afe2cd5e46497ce339f (diff)
downloadpython-setuptools-git-f07c527906b54fa8245c6804ae8062c8ddd6c6d7.tar.gz
Drop compatibility function exec_, required for Python 2.5 and earlier.
Diffstat (limited to 'pkg_resources.py')
-rw-r--r--pkg_resources.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 2c19898b..5642e352 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -35,7 +35,7 @@ try:
basestring
next = lambda o: o.next()
from cStringIO import StringIO as BytesIO
- def exec_(code, globs=None, locs=None):
+ def exec(code, globs=None, locs=None):
if globs is None:
frame = sys._getframe(1)
globs = frame.f_globals
@@ -54,7 +54,7 @@ except NameError:
globs = globals()
if locs is None:
locs = globs
- exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
+ exec(compile(open(fn).read(), fn, 'exec'), globs, locs)
import functools
reduce = functools.reduce
@@ -1354,7 +1354,7 @@ class NullProvider:
len(script_text), 0, script_text.split('\n'), script_filename
)
script_code = compile(script_text,script_filename,'exec')
- exec_(script_code, namespace, namespace)
+ exec(script_code, namespace, namespace)
def _has(self, path):
raise NotImplementedError(