[pypy-commit] pypy py3k: adjust per PyCode's changes to frozen modules and app_name='__import__'

[pjenvey]

Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r83955:d876ff0650f5
Date: 2016-04-26 21:16 -0700
http://bitbucket.org/pypy/pypy/changeset/d876ff0650f5/

Log:    adjust per PyCode's changes to frozen modules and
        app_name='__import__'

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
@@ -1,12 +1,14 @@
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.error import OperationError
 
-@interp2app
 def import_with_frames_removed(space, __args__):
     try:
         return space.call_args(
             space.getbuiltinmodule('_frozen_importlib').getdictvalue(
                 space, '__import__'), __args__)
     except OperationError as e:
-        e.remove_traceback_module_frames('<frozen importlib._bootstrap>')
+        e.remove_traceback_module_frames(
+            '<builtin>/frozen importlib._bootstrap')
         raise
+import_with_frames_removed = interp2app(import_with_frames_removed,
+                                        app_name='__import__')
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit