[pypy-commit] pypy py3.5-raffael_t: Fix location of stdlib after rebasing
rlamy
pypy.commits at gmail.com
Tue Apr 26 19:32:52 EDT 2016
Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5-raffael_t
Changeset: r83947:5f1dc236f900
Date: 2016-04-26 19:21 +0100
http://bitbucket.org/pypy/pypy/changeset/5f1dc236f900/
Log: Fix location of stdlib after rebasing
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
@@ -826,7 +826,7 @@
from os.path import abspath, join, dirname as dn
thisfile = abspath(__file__)
root = dn(dn(dn(thisfile)))
- return [join(root, 'lib-python', '3.5'),
+ return [join(root, 'lib-python', '3'),
join(root, 'lib_pypy')]
def pypy_resolvedirof(s):
diff --git a/pypy/tool/lib_pypy.py b/pypy/tool/lib_pypy.py
--- a/pypy/tool/lib_pypy.py
+++ b/pypy/tool/lib_pypy.py
@@ -5,7 +5,7 @@
LIB_ROOT = py.path.local(pypy.__path__[0]).dirpath()
LIB_PYPY = LIB_ROOT.join('lib_pypy')
-LIB_PYTHON = LIB_ROOT.join('lib-python', '%d.%d' % CPYTHON_VERSION[0:2])
+LIB_PYTHON = LIB_ROOT.join('lib-python', '%d' % CPYTHON_VERSION[0])
def import_from_lib_pypy(modname):
More information about the pypy-commit
mailing list