diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pyramid/compat.py | 8 | ||||
| -rw-r--r-- | src/pyramid/scripts/pshell.py | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/pyramid/compat.py b/src/pyramid/compat.py index c2d7c7f3f..e502cbce4 100644 --- a/src/pyramid/compat.py +++ b/src/pyramid/compat.py @@ -62,11 +62,6 @@ url_unquote_text = url_unquote url_unquote_native = url_unquote -import builtins - -exec_ = getattr(builtins, "exec") - - def reraise(tp, value, tb=None): if value is None: value = tp @@ -75,9 +70,6 @@ def reraise(tp, value, tb=None): raise value -del builtins - - def iteritems_(d): return d.items() diff --git a/src/pyramid/scripts/pshell.py b/src/pyramid/scripts/pshell.py index e63114d18..a9f02e408 100644 --- a/src/pyramid/scripts/pshell.py +++ b/src/pyramid/scripts/pshell.py @@ -6,7 +6,6 @@ import sys import textwrap import pkg_resources -from pyramid.compat import exec_ from pyramid.util import DottedNameResolver from pyramid.util import make_contextmanager from pyramid.paster import bootstrap @@ -214,7 +213,7 @@ class PShellCommand(object): if self.pystartup and os.path.isfile(self.pystartup): with open(self.pystartup, 'rb') as fp: - exec_(fp.read().decode('utf-8'), env) + exec(fp.read().decode('utf-8'), env) if '__builtins__' in env: del env['__builtins__'] |