Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3.3
Changeset: r82189:249ebc5d87a0
Date: 2016-02-12 18:06 +0100
http://bitbucket.org/pypy/pypy/changeset/249ebc5d87a0/
Log: Improve (but not fix) app_main.py's Python 3.5 compatibility for
testing on top of CPython and forward-compatibility.
diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/app_main.py
@@ -668,11 +668,14 @@
# assume it's a pyc file only if its name says so.
# CPython goes to great lengths to detect other cases
# of pyc file format, but I think it's ok not to care.
- import _frozen_importlib
+ try:
+ from _frozen_importlib import SourcelessFileLoader
+ except ImportError:
+ from _frozen_importlib_external import SourcelessFileLoader
if IS_WINDOWS:
filename = filename.lower()
if filename.endswith('.pyc') or filename.endswith('.pyo'):
- loader = _frozen_importlib.SourcelessFileLoader('__main__',
filename)
+ loader = SourcelessFileLoader('__main__', filename)
args = (loader.load_module,)
else:
filename = sys.argv[0]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
