[pypy-commit] pypy py3.6: use an extension name like pypy36-pp73 not pypy3-73 to prevent conflicts between py3.6, py.37

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r97882:c4659943384c
Date: 2019-10-29 15:39 +0200
http://bitbucket.org/pypy/pypy/changeset/c4659943384c/

Log:	use an extension name like pypy36-pp73 not pypy3-73 to prevent
	conflicts between py3.6, py.37

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
@@ -21,8 +21,8 @@
 _WIN32 = sys.platform == 'win32'
 
 SO = '.pyd' if _WIN32 else '.so'
-PREFIX = 'pypy3-'
-DEFAULT_SOABI_BASE = '%s%d%d' % ((PREFIX,) + PYPY_VERSION[:2])
+PREFIX = 'pypy%d%d-' % CPYTHON_VERSION[:2]
+DEFAULT_SOABI_BASE = '%spp%d%d' % ((PREFIX,) + PYPY_VERSION[:2])
 
 PYC_TAG = '%s%d%d' % ((PREFIX,) + CPYTHON_VERSION[:2])   # 'pypy3-XY'
 
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,5 @@
         import sys
         if not hasattr(sys, 'pypy_version_info'):
             skip('This test is PyPy-only')
-        assert imp.get_tag() == 'pypy3-%d%d' % sys.version_info[0:2]
+        assert imp.get_tag() == 'pypy%d%d-pp%d%d' % (
+                            sys.version_info[:2] + sys.pypy_version_info[:2])