Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3.5
Changeset: r90771:1bfadfa3ba91
Date: 2017-03-20 20:35 +0100
http://bitbucket.org/pypy/pypy/changeset/1bfadfa3ba91/
Log: hg merge default
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -83,5 +83,6 @@
.hypothesis/
^release/
^rpython/_cache$
+^\.cache$
pypy/module/cppyy/.+/*\.pcm
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -34,4 +34,5 @@
050d84dd78997f021acf0e133934275d63547cc0 release-pypy2.7-v5.4.1
0e2d9a73f5a1818d0245d75daccdbe21b2d5c3ef release-pypy2.7-v5.4.1
aff251e543859ce4508159dd9f1a82a2f553de00 release-pypy2.7-v5.6.0
-ea9979b550eeae87924dc4bef06070e8f8d0e22f release-pypy3.3-5.5.0
+fa3249d55d15b9829e1be69cdf45b5a44cec902d release-pypy2.7-v5.7.0
+b16a4363e930f6401bceb499b9520955504c6cb0 release-pypy3.5-v5.7.0
diff --git a/lib-python/2.7/sysconfig.py b/lib-python/2.7/sysconfig.py
--- a/lib-python/2.7/sysconfig.py
+++ b/lib-python/2.7/sysconfig.py
@@ -29,8 +29,8 @@
'pypy': {
'stdlib': '{base}/lib-{implementation_lower}/{py_version_short}',
'platstdlib': '{base}/lib-{implementation_lower}/{py_version_short}',
- 'purelib': '{base}/lib-{implementation_lower}/{py_version_short}',
- 'platlib': '{base}/lib-{implementation_lower}/{py_version_short}',
+ 'purelib': '{base}/site-packages',
+ 'platlib': '{base}/site-packages',
'include': '{base}/include',
'platinclude': '{base}/include',
'scripts': '{base}/bin',
diff --git a/pypy/doc/release-v5.7.0.rst b/pypy/doc/release-v5.7.0.rst
--- a/pypy/doc/release-v5.7.0.rst
+++ b/pypy/doc/release-v5.7.0.rst
@@ -2,8 +2,11 @@
PyPy2.7 and PyPy3.5 v5.7 - two in one release
=============================================
-We have released PyPy2.7 v5.7, and a beta-quality PyPy3.5 v5.7 (for
-Linux 64bit only at first).
+The PyPy team is proud to release both PyPy2.7 v5.7 (an interpreter supporting
+Python v2.7 syntax), and a beta-quality PyPy3.5 v5.7 (an interpreter for Python
+v3.5 syntax). The two releases are both based on much the same codebase, thus
+the dual release. Note that PyPy3.5 supports Linux 64bit only for now.
+
This new PyPy2.7 release includes the upstream stdlib version 2.7.13, and
PyPy3.5 (our first in the 3.5 series) includes the upstream stdlib version
3.5.3.
@@ -88,7 +91,8 @@
* New features and cleanups
* update the format of the PYPYLOG file and improvements to vmprof
- * emit more sysconfig values for downstream cextension packages
+ * emit more sysconfig values for downstream cextension packages including
+ properly setting purelib and platlib to site-packages
* add ``PyAnySet_Check``, ``PyModule_GetName``, ``PyWeakref_Check*``,
``_PyImport_{Acquire,Release}Lock``, ``PyGen_Check*``, ``PyOS_AfterFork``,
* detect and raise on recreation of a PyPy object from a PyObject during
@@ -131,6 +135,8 @@
filling more slots, especially ``tp_new`` and ``tp_dealloc``
* fix for ``ctypes.c_bool`` returning ``bool`` restype, issue #2475_
* fix in corner cases with the GIL and C-API functions
+ * allow overriding thread.local.__init__ in a subclass, issue #2501_
+ * allow ``PyClass_New`` to be called with NULL as the first arguemnt, issue
#2504_
* Performance improvements:
@@ -183,21 +189,19 @@
* Performance improvements:
* do not create a list whenever ``descr_new`` of a ``bytesobject`` is called
- *
- *
- *
* The following features of Python 3.5 are not implemented yet in PyPy:
* PEP 442: Safe object finalization
* PEP 489: Multi-phase extension module initialization
- * XXX what else?
.. _resolved: whatsnew-pypy2-5.7.0.html
.. _19542: https://bugs.python.org/issue19542
.. _2434:
https://bitbucket.org/pypy/pypy/issues/2434/support-pybind11-in-conjunction-with-pypys
.. _2446:
https://bitbucket.org/pypy/pypy/issues/2446/cpyext-tp_doc-field-not-reflected-on
.. _2475: https://bitbucket.org/pypy/pypy/issues/2475
+.. _2501: https://bitbucket.org/pypy/pypy/issues/2501
+.. _2504: https://bitbucket.org/pypy/pypy/issues/2504
.. _RevDB: https://bitbucket.org/pypy/revdb
.. _cryptography: https://cryptography.io
.. _cppyy: cppyy.html
diff --git a/pypy/module/zipimport/interp_zipimport.py
b/pypy/module/zipimport/interp_zipimport.py
--- a/pypy/module/zipimport/interp_zipimport.py
+++ b/pypy/module/zipimport/interp_zipimport.py
@@ -269,11 +269,18 @@
if compiled:
w_result = self.import_pyc_file(space, fullname, fname,
buf, pkgpath)
- if w_result is not None:
- return w_result
+ if w_result is None:
+ continue
else:
- return self.import_py_file(space, fullname, fname,
+ w_result = self.import_py_file(space, fullname, fname,
buf, pkgpath)
+ if space.sys.get_flag('verbose') >= 1:
+ w_stderr = space.sys.get('stderr')
+ message = "import %s # loaded from Zip %s%s%s\n" % (
+ fullname, self.filename, os.path.sep, fname)
+ space.call_method(w_stderr, "write",
+ space.newtext(message))
+ return w_result
except:
w_mods = space.sys.get('modules')
space.call_method(w_mods, 'pop', w_fullname, space.w_None)
diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -1,6 +1,6 @@
# Edit these appropriately before running this script
maj=5
-min=6
+min=7
rev=0
branchname=release-pypy2.7-5.x # ==OR== release-$maj.x # ==OR==
release-$maj.$min.x
tagname=release-pypy2.7-v$maj.$min.$rev # ==OR== release-$maj.$min
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
