Changes: - Rename the binary, include and library to pypy-2.1 (recommended by mva@). This is in preparation to introduce PyPy3 (PyPy implementing Python 3.2) Highlights: * JIT support for ARM, architecture versions 6 and 7, hard- and soft-float ABI * Stacklet support for ARM * Support for os.statvfs and os.fstatvfs on unix systems * Improved logging performance * Faster sets for objects * Interpreter improvements * During packaging, compile the CFFI based TK extension * Pickling of numpy arrays and dtypes * Subarrays for numpy * Bugfixes to numpy * Bugfixes to cffi and ctypes * Bugfixes to the x86 stacklet support * Fixed issue 1533: fix an RPython-level OverflowError for space.float_w(w_big_long_number). https://bugs.pypy.org/issue1533 * Fixed issue 1552: GreenletExit should inherit from BaseException. https://bugs.pypy.org/issue1552 * Fixed issue 1537: numpypy __array_interface__ https://bugs.pypy.org/issue1537 * Fixed issue 1238: Writing to an SSL socket in PyPy sometimes failed with a "bad write retry" message. https://bugs.pypy.org/issue1238
21 lines
905 B
Python
21 lines
905 B
Python
--- pypy/module/sys/initpath.py.orig 2012-11-27 18:15:02.000000000 +0200
|
|
+++ pypy/module/sys/initpath.py 2012-11-27 18:19:45.000000000 +0200
|
|
@@ -90,14 +90,13 @@
|
|
least contain a directory called ``lib-python/X.Y`` and another one called
|
|
``lib_pypy``. If they cannot be found, it raises OSError.
|
|
"""
|
|
- from pypy.module.sys.version import CPYTHON_VERSION
|
|
- dirname = '%d.%d' % (CPYTHON_VERSION[0],
|
|
- CPYTHON_VERSION[1])
|
|
- lib_python = os.path.join(prefix, 'lib-python')
|
|
+ from pypy.module.sys.version import PYPY_VERSION
|
|
+ dirname = 'pypy-%d.%d' % PYPY_VERSION[:2]
|
|
+ lib_python = os.path.join(prefix, 'lib')
|
|
python_std_lib = os.path.join(lib_python, dirname)
|
|
_checkdir(python_std_lib)
|
|
|
|
- lib_pypy = os.path.join(prefix, 'lib_pypy')
|
|
+ lib_pypy = os.path.join(python_std_lib, 'lib_pypy')
|
|
_checkdir(lib_pypy)
|
|
|
|
importlist = []
|