Author: marky1991 <[email protected]>
Branch: py3.3
Changeset: r81721:52ae5b33f67d
Date: 2016-01-10 22:00 -0500
http://bitbucket.org/pypy/pypy/changeset/52ae5b33f67d/
Log: Revert unnecessary change to frozen importlib. The changes to the
general pickle module make this no longer needed.
diff --git a/pypy/module/_frozen_importlib/__init__.py
b/pypy/module/_frozen_importlib/__init__.py
--- a/pypy/module/_frozen_importlib/__init__.py
+++ b/pypy/module/_frozen_importlib/__init__.py
@@ -30,7 +30,7 @@
space.wrap(space.builtin))
code_w.exec_code(space, self.w_dict, self.w_dict)
- self.w_import = space.wrap(interp_import.__import__)
+ self.w_import = space.wrap(interp_import.import_with_frames_removed)
def startup(self, space):
"""Copy our __import__ to builtins."""
diff --git a/pypy/module/_frozen_importlib/interp_import.py
b/pypy/module/_frozen_importlib/interp_import.py
--- a/pypy/module/_frozen_importlib/interp_import.py
+++ b/pypy/module/_frozen_importlib/interp_import.py
@@ -2,7 +2,7 @@
from pypy.interpreter.error import OperationError
@interp2app
-def __import__(space, __args__):
+def import_with_frames_removed(space, __args__):
try:
return space.call_args(
space.getbuiltinmodule('_frozen_importlib').getdictvalue(
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
