[pypy-commit] pypy py3k: match cpython's frozen importlib name (it's still exposed in some cases)

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r84237:ca2390b5a5cc
Date: 2016-05-05 19:40 -0700
http://bitbucket.org/pypy/pypy/changeset/ca2390b5a5cc/

Log:	match cpython's frozen importlib name (it's still exposed in some
	cases)

diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
--- a/pypy/interpreter/pycode.py
+++ b/pypy/interpreter/pycode.py
@@ -188,7 +188,8 @@
         #     <builtin>/lastdirname/basename.py
         # instead of freezing the complete translation-time path.
         filename = self.co_filename
-        if filename.startswith('<builtin>'):
+        if (filename.startswith('<builtin>') or
+            filename == '<frozen importlib._bootstrap>'):
             return
         filename = filename.lstrip('<').rstrip('>')
         if filename.lower().endswith('.pyc'):
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
@@ -7,8 +7,7 @@
             space.getbuiltinmodule('_frozen_importlib').getdictvalue(
                 space, '__import__'), __args__)
     except OperationError as e:
-        e.remove_traceback_module_frames(
-            '<builtin>/frozen importlib._bootstrap')
+        e.remove_traceback_module_frames('<frozen importlib._bootstrap>')
         raise
 import_with_frames_removed = interp2app(import_with_frames_removed,
                                         app_name='__import__')