[pypy-commit] pypy py3k: merge default
plan_rich
pypy.commits at gmail.com
Tue Aug 30 04:13:50 EDT 2016
Author: Richard Plangger <planrichi at gmail.com>
Branch: py3k
Changeset: r86723:a803524ac2de
Date: 2016-08-30 10:12 +0200
http://bitbucket.org/pypy/pypy/changeset/a803524ac2de/
Log: merge default
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -74,6 +74,7 @@
Seo Sanghyeon
Ronny Pfannschmidt
Justin Peel
+ Raffael Tfirst
David Edelsohn
Anders Hammarquist
Jakub Gustak
@@ -117,7 +118,6 @@
Wenzhu Man
John Witulski
Laurence Tratt
- Raffael Tfirst
Ivan Sichmann Freitas
Greg Price
Dario Bertini
@@ -141,6 +141,7 @@
tav
Taavi Burns
Georg Brandl
+ Nicolas Truessel
Bert Freudenberg
Stian Andreassen
Wanja Saatkamp
@@ -211,6 +212,7 @@
Vaibhav Sood
Alan McIntyre
Alexander Sedov
+ p_zieschang at yahoo.de
Attila Gobi
Jasper.Schulz
Christopher Pope
@@ -221,6 +223,7 @@
Arjun Naik
Valentina Mukhamedzhanova
Stefano Parmesan
+ touilleMan
Alexis Daboville
Jens-Uwe Mager
Carl Meyer
@@ -229,12 +232,14 @@
Gabriel
Lukas Vacek
Kunal Grover
+ Aaron Gallagher
Andrew Dalke
Sylvain Thenault
Jakub Stasiak
Nathan Taylor
Vladimir Kryachko
Omer Katz
+ Mark Williams
Jacek Generowicz
Alejandro J. Cura
Jacob Oscarson
@@ -355,12 +360,15 @@
yasirs
Michael Chermside
Anna Ravencroft
+ pizi
Andrey Churin
Dan Crosta
+ Eli Stevens
Tobias Diaz
Julien Phalip
Roman Podoliaka
Dan Loewenherz
+ werat
Heinrich-Heine University, Germany
Open End AB (formerly AB Strakt), Sweden
@@ -468,15 +476,3 @@
https://github.com/gperftools/gperftools/blob/master/COPYING
-License for 'liblzma and 'lzmaffi'
-----------------------------------
-
-This copy of PyPy may be linked (dynamically or statically) with the
-liblzma library, which was put in the "public domain":
-
- http://tukaani.org/xz/
-
-The cffi bindings to liblzma (in lib_pypy/_lzma.py) are derived from
-the lzmaffi project which is distributed under a BSD license:
-
- https://pypi.python.org/pypi/lzmaffi/0.3.0
diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
--- a/pypy/doc/contributor.rst
+++ b/pypy/doc/contributor.rst
@@ -44,6 +44,7 @@
Seo Sanghyeon
Ronny Pfannschmidt
Justin Peel
+ Raffael Tfirst
David Edelsohn
Anders Hammarquist
Jakub Gustak
@@ -87,7 +88,6 @@
Wenzhu Man
John Witulski
Laurence Tratt
- Raffael Tfirst
Ivan Sichmann Freitas
Greg Price
Dario Bertini
@@ -111,6 +111,7 @@
tav
Taavi Burns
Georg Brandl
+ Nicolas Truessel
Bert Freudenberg
Stian Andreassen
Wanja Saatkamp
@@ -181,6 +182,7 @@
Vaibhav Sood
Alan McIntyre
Alexander Sedov
+ p_zieschang at yahoo.de
Attila Gobi
Jasper.Schulz
Christopher Pope
@@ -191,6 +193,7 @@
Arjun Naik
Valentina Mukhamedzhanova
Stefano Parmesan
+ touilleMan
Alexis Daboville
Jens-Uwe Mager
Carl Meyer
@@ -199,12 +202,14 @@
Gabriel
Lukas Vacek
Kunal Grover
+ Aaron Gallagher
Andrew Dalke
Sylvain Thenault
Jakub Stasiak
Nathan Taylor
Vladimir Kryachko
Omer Katz
+ Mark Williams
Jacek Generowicz
Alejandro J. Cura
Jacob Oscarson
@@ -325,9 +330,12 @@
yasirs
Michael Chermside
Anna Ravencroft
+ pizi
Andrey Churin
Dan Crosta
+ Eli Stevens
Tobias Diaz
Julien Phalip
Roman Podoliaka
Dan Loewenherz
+ werat
diff --git a/pypy/doc/release-pypy2.7-v5.4.0.rst b/pypy/doc/release-pypy2.7-v5.4.0.rst
--- a/pypy/doc/release-pypy2.7-v5.4.0.rst
+++ b/pypy/doc/release-pypy2.7-v5.4.0.rst
@@ -3,7 +3,8 @@
============
We have released PyPy2.7 v5.4, a little under two months after PyPy2.7 v5.3.
-This new PyPy2.7 release includes further improvements to our C-API compatability layer (cpyext), enabling us to pass over 99% of the upstream
+This new PyPy2.7 release includes incremental improvements to our C-API
+compatability layer (cpyext), enabling us to pass over 99% of the upstream
numpy `test suite`_. We updated built-in cffi_ support to version 1.8,
which now supports the "limited API" mode for c-extensions on
CPython >=3.2.
@@ -12,9 +13,7 @@
support to OpenBSD and Dragon Fly BSD
As always, this release fixed many issues and bugs raised by the
-growing community of PyPy users.
-
-XXXXX MORE ???
+growing community of PyPy users. We strongly recommend updating.
You can download the PyPy2.7 v5.4 release here:
@@ -110,8 +109,8 @@
* (RPython) add `rposix_scandir` portably, needed for Python 3.5
- * Support for memoryview attributes (format, itemsize, ...) which also
- adds support for `PyMemoryView_FromObject`
+ * Increased but incomplete support for memoryview attributes (format,
+ itemsize, ...) which also adds support for `PyMemoryView_FromObject`
* Bug Fixes
@@ -153,10 +152,6 @@
* Make `hash(-1)` return -2, as CPython does, and fix all the
ancilary places this matters
- * Issues reported with our previous release were resolved_ after
- reports from users on our issue tracker at
- https://bitbucket.org/pypy/pypy/issues or on IRC at #pypy
-
* Fix `PyNumber_Check()` to behave more like CPython
* (VMProf) Try hard to not miss any Python-level frame in the
@@ -169,6 +164,10 @@
* Fix the mapdict cache for subclasses of builtin types that
provide a dict
+ * Issues reported with our previous release were resolved_ after
+ reports from users on our issue tracker at
+ https://bitbucket.org/pypy/pypy/issues or on IRC at #pypy
+
* Performance improvements:
* Add a before_call()-like equivalent before a few operations like
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -5,4 +5,5 @@
.. this is a revision shortly after release-pypy2.7-v5.4
.. startrev: 522736f816dc
-
+.. branch: rpython-resync
+Backport rpython changes made directly on the py3k and py3.5 branches.
diff --git a/pypy/module/cpyext/test/test_cpyext.py b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -92,10 +92,20 @@
link_extra=link_extra,
libraries=libraries)
from pypy.module.imp.importing import get_so_extension
- pydname = soname.new(purebasename=modname, ext=get_so_extension(space))
+ ext = get_so_extension(space)
+ pydname = soname.new(purebasename=modname, ext=ext)
soname.rename(pydname)
return str(pydname)
+def get_so_suffix():
+ from imp import get_suffixes, C_EXTENSION
+ for suffix, mode, typ in get_suffixes():
+ if typ == C_EXTENSION:
+ return suffix
+ else:
+ raise RuntimeError("This interpreter does not define a filename "
+ "suffix for C extensions!")
+
def compile_extension_module_applevel(space, modname, include_dirs=[],
source_files=None, source_strings=None):
"""
@@ -126,13 +136,9 @@
source_strings=source_strings,
compile_extra=compile_extra,
link_extra=link_extra)
- from imp import get_suffixes, C_EXTENSION
- pydname = soname
- for suffix, mode, typ in get_suffixes():
- if typ == C_EXTENSION:
- pydname = soname.new(purebasename=modname, ext=suffix)
- soname.rename(pydname)
- break
+ ext = get_so_suffix()
+ pydname = soname.new(purebasename=modname, ext=ext)
+ soname.rename(pydname)
return str(pydname)
def freeze_refcnts(self):
diff --git a/rpython/rlib/rjitlog/rjitlog.py b/rpython/rlib/rjitlog/rjitlog.py
--- a/rpython/rlib/rjitlog/rjitlog.py
+++ b/rpython/rlib/rjitlog/rjitlog.py
@@ -430,9 +430,8 @@
def encode_merge_point(log, compressor, values):
line = []
- unrolled = unrolling_iterable(values)
i = 0
- for value in unrolled:
+ for value in values:
line.append(value.encode(log,i,compressor))
i += 1
return ''.join(line)
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -1164,14 +1164,14 @@
walloc = lltype.scoped_alloc(rwin32.LPHANDLE.TO, 1)
with ralloc as pread, walloc as pwrite:
if CreatePipe(pread, pwrite, lltype.nullptr(rffi.VOIDP.TO), 0):
- fdread = c_open_osfhandle(
- rffi.cast(rffi.INTPTR_T, pread[0]), 0)
- fdwrite = c_open_osfhandle(
- rffi.cast(rffi.INTPTR_T, pwrite[0]), 1)
+ hread = pread[0]
+ hwrite = pwrite[0]
+ fdread = c_open_osfhandle(rffi.cast(rffi.INTPTR_T, hread), 0)
+ fdwrite = c_open_osfhandle(rffi.cast(rffi.INTPTR_T, hwrite), 1)
if not (fdread == -1 or fdwrite == -1):
return (fdread, fdwrite)
- rwin32.CloseHandle(pread)
- rwin32.CloseHandle(pwrite)
+ rwin32.CloseHandle(hread)
+ rwin32.CloseHandle(hwrite)
raise WindowsError(rwin32.GetLastError_saved(), "CreatePipe failed")
else:
filedes = lltype.malloc(INT_ARRAY_P.TO, 2, flavor='raw')
More information about the pypy-commit
mailing list