Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r97857:2dca56b6a653
Date: 2019-10-25 10:01 +0300
http://bitbucket.org/pypy/pypy/changeset/2dca56b6a653/
Log: the pyc filename is not dependent on the pypy version; do like
cpython
diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py
--- a/pypy/module/imp/importing.py
+++ b/pypy/module/imp/importing.py
@@ -16,7 +16,7 @@
from rpython.rlib.objectmodel import we_are_translated, specialize
from rpython.rlib.signature import signature
from rpython.rlib import rposix_stat, types
-from pypy.module.sys.version import PYPY_VERSION
+from pypy.module.sys.version import PYPY_VERSION, CPYTHON_VERSION
_WIN32 = sys.platform == 'win32'
@@ -24,7 +24,7 @@
PREFIX = 'pypy3-'
DEFAULT_SOABI_BASE = '%s%d%d' % ((PREFIX,) + PYPY_VERSION[:2])
-PYC_TAG = '%s%d%d' % ((PREFIX,) + PYPY_VERSION[:2]) # 'pypy3-XY'
+PYC_TAG = '%s%d%d' % ((PREFIX,) + CPYTHON_VERSION[:2]) # 'pypy3-XY'
# see also pypy_incremental_magic in interpreter/pycode.py for the magic
# version number stored inside pyc files.
diff --git a/pypy/module/imp/test/test_app.py b/pypy/module/imp/test/test_app.py
--- a/pypy/module/imp/test/test_app.py
+++ b/pypy/module/imp/test/test_app.py
@@ -315,4 +315,4 @@
import sys
if not hasattr(sys, 'pypy_version_info'):
skip('This test is PyPy-only')
- assert imp.get_tag() == 'pypy3-%d%d' % sys.pypy_version_info[0:2]
+ assert imp.get_tag() == 'pypy3-%d%d' % sys.version_info[0:2]
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
