[pypy-commit] pypy py3.5: avoid sys.version during bootstrapping as its setup lazily (3.6 uses

pjenvey pypy.commits at gmail.com
Sat Sep 17 14:41:04 EDT 2016


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3.5
Changeset: r87192:8adf0a90a67b
Date: 2016-09-17 11:40 -0700
http://bitbucket.org/pypy/pypy/changeset/8adf0a90a67b/

Log:	avoid sys.version during bootstrapping as its setup lazily (3.6 uses
	sys.version_info anyway: cpython issue #25985)

diff --git a/lib-python/3/importlib/_bootstrap_external.py b/lib-python/3/importlib/_bootstrap_external.py
--- a/lib-python/3/importlib/_bootstrap_external.py
+++ b/lib-python/3/importlib/_bootstrap_external.py
@@ -606,7 +606,7 @@
         else:
             registry_key = cls.REGISTRY_KEY
         key = registry_key.format(fullname=fullname,
-                                  sys_version=sys.version[:3])
+                                  sys_version='%d.%d' % sys.version_info[:2])
         try:
             with cls._open_registry(key) as hkey:
                 filepath = _winreg.QueryValue(hkey, '')


More information about the pypy-commit mailing list