diff options
| -rw-r--r-- | pkg_resources.py | 6 | ||||
| -rw-r--r-- | setuptools/compat.py | 16 | ||||
| -rw-r--r-- | setuptools/tests/doctest.py | 2 |
3 files changed, 6 insertions, 18 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( diff --git a/setuptools/compat.py b/setuptools/compat.py index 8b7ea904..fdb7d8ed 100644 --- a/setuptools/compat.py +++ b/setuptools/compat.py @@ -33,18 +33,7 @@ if sys.version_info[0] < 3: from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit filterfalse = itertools.ifilterfalse - def exec_(code, globs=None, locs=None): - if globs is None: - frame = sys._getframe(1) - globs = frame.f_globals - if locs is None: - locs = frame.f_locals - del frame - elif locs is None: - locs = globs - exec("""exec code in globs, locs""") - - exec_("""def reraise(tp, value, tb=None): + exec("""def reraise(tp, value, tb=None): raise tp, value, tb""") else: PY3 = True @@ -52,7 +41,6 @@ else: basestring = str import builtins import configparser as ConfigParser - exec_ = eval('exec') from io import StringIO, BytesIO func_code = lambda o: o.__code__ func_globals = lambda o: o.__globals__ @@ -89,7 +77,7 @@ else: source = f.read() finally: f.close() - exec_(compile(source, fn, 'exec'), globs, locs) + exec(compile(source, fn, 'exec'), globs, locs) def reraise(tp, value, tb=None): if value.__traceback__ is not tb: diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py index 35d588d0..0c160fe4 100644 --- a/setuptools/tests/doctest.py +++ b/setuptools/tests/doctest.py @@ -1250,7 +1250,7 @@ class DocTestRunner: # keyboard interrupts.) try: # Don't blink! This is where the user's code gets run. - exec_(compile(example.source, filename, "single", + exec(compile(example.source, filename, "single", compileflags, 1), test.globs) self.debugger.set_continue() # ==== Example Finished ==== exception = None |