Author: Ronan Lamy <[email protected]> Branch: fix-result-types Changeset: r77552:126efe5cc8f2 Date: 2015-05-25 20:11 +0100 http://bitbucket.org/pypy/pypy/changeset/126efe5cc8f2/
Log: hg merge default diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -38,8 +38,8 @@ Armin Rigo Maciej Fijalkowski Carl Friedrich Bolz + Amaury Forgeot d'Arc Antonio Cuni - Amaury Forgeot d'Arc Samuele Pedroni Alex Gaynor Brian Kearns @@ -50,9 +50,9 @@ Holger Krekel Christian Tismer Hakan Ardo - Benjamin Peterson Manuel Jacob Ronan Lamy + Benjamin Peterson Anders Chrigstrom Eric van Riet Paap Wim Lavrijsen @@ -63,8 +63,8 @@ Sven Hager Anders Lehmann Aurelien Campeas + Remi Meier Niklaus Haldimann - Remi Meier Camillo Bruni Laura Creighton Toon Verwaest @@ -76,10 +76,10 @@ David Edelsohn Anders Hammarquist Jakub Gustak + Gregor Wegberg Guido Wesdorp Lawrence Oluyede Bartosz Skowron - Gregor Wegberg Daniel Roberts Niko Matsakis Adrien Di Mascio @@ -87,10 +87,11 @@ Ludovic Aubry Jacob Hallen Jason Creighton + Richard Plangger Alex Martelli Michal Bendowski + stian Jan de Mooij - stian Tyler Wade Michael Foord Stephan Diehl @@ -133,15 +134,15 @@ Georg Brandl Bert Freudenberg Stian Andreassen + Edd Barrett Wanja Saatkamp Gerald Klix Mike Blume + Tobias Pape Oscar Nierstrasz Stefan H. Muller - Edd Barrett Jeremy Thurgood Rami Chowdhury - Tobias Pape Eugene Oden Henry Mason Vasily Kuznetsov @@ -167,11 +168,13 @@ Michael Twomey Lucian Branescu Mihaila Yichao Yu + Anton Gulenko Gabriel Lavoie Olivier Dormond Jared Grubb Karl Bartel Wouter van Heyst + Sebastian Pawluś Brian Dorsey Victor Stinner Andrews Medina @@ -188,6 +191,7 @@ Neil Shepperd Stanislaw Halik Mikael Schönenberg + Berkin Ilbeyi Elmo M?ntynen Jonathan David Riehl Anders Qvist @@ -211,11 +215,11 @@ Carl Meyer Karl Ramm Pieter Zieschang - Sebastian Pawluś Gabriel Lukas Vacek Andrew Dalke Sylvain Thenault + Jakub Stasiak Nathan Taylor Vladimir Kryachko Jacek Generowicz @@ -242,6 +246,7 @@ Tomo Cocoa Toni Mattis Lucas Stadler + Julian Berman roberto@goyle Yury V. Zaytsev Anna Katrina Dominguez @@ -253,6 +258,8 @@ Ben Darnell Roberto De Ioris Juan Francisco Cantero Hurtado + Ruochen Huang + Jeong YunWon Godefroid Chappelle Joshua Gilbert Dan Colish @@ -271,6 +278,7 @@ Christian Muirhead Berker Peksag James Lan + Volodymyr Vladymyrov shoma hosaka Daniel Neuhäuser Ben Mather @@ -316,6 +324,7 @@ yasirs Michael Chermside Anna Ravencroft + Andrey Churin Dan Crosta Julien Phalip Roman Podoliaka diff --git a/lib_pypy/cffi.egg-info/PKG-INFO b/lib_pypy/cffi.egg-info/PKG-INFO --- a/lib_pypy/cffi.egg-info/PKG-INFO +++ b/lib_pypy/cffi.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cffi -Version: 1.0.2 +Version: 1.0.3 Summary: Foreign Function Interface for Python calling C code. Home-page: http://cffi.readthedocs.org Author: Armin Rigo, Maciej Fijalkowski diff --git a/lib_pypy/cffi/__init__.py b/lib_pypy/cffi/__init__.py --- a/lib_pypy/cffi/__init__.py +++ b/lib_pypy/cffi/__init__.py @@ -4,8 +4,8 @@ from .api import FFI, CDefError, FFIError from .ffiplatform import VerificationError, VerificationMissing -__version__ = "1.0.2" -__version_info__ = (1, 0, 2) +__version__ = "1.0.3" +__version_info__ = (1, 0, 3) # The verifier module file names are based on the CRC32 of a string that # contains the following version number. It may be older than __version__ diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py --- a/pypy/config/pypyoption.py +++ b/pypy/config/pypyoption.py @@ -39,7 +39,6 @@ ]) if sys.platform.startswith('linux') and sys.maxint > 2147483647: - if 0: # XXX disabled until we fix the absurd .so mess working_modules.add('_vmprof') translation_modules = default_modules.copy() diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst --- a/pypy/doc/contributor.rst +++ b/pypy/doc/contributor.rst @@ -8,8 +8,8 @@ Armin Rigo Maciej Fijalkowski Carl Friedrich Bolz + Amaury Forgeot d'Arc Antonio Cuni - Amaury Forgeot d'Arc Samuele Pedroni Alex Gaynor Brian Kearns @@ -20,9 +20,9 @@ Holger Krekel Christian Tismer Hakan Ardo - Benjamin Peterson Manuel Jacob Ronan Lamy + Benjamin Peterson Anders Chrigstrom Eric van Riet Paap Wim Lavrijsen @@ -33,8 +33,8 @@ Sven Hager Anders Lehmann Aurelien Campeas + Remi Meier Niklaus Haldimann - Remi Meier Camillo Bruni Laura Creighton Toon Verwaest @@ -46,10 +46,10 @@ David Edelsohn Anders Hammarquist Jakub Gustak + Gregor Wegberg Guido Wesdorp Lawrence Oluyede Bartosz Skowron - Gregor Wegberg Daniel Roberts Niko Matsakis Adrien Di Mascio @@ -57,10 +57,11 @@ Ludovic Aubry Jacob Hallen Jason Creighton + Richard Plangger Alex Martelli Michal Bendowski + stian Jan de Mooij - stian Tyler Wade Michael Foord Stephan Diehl @@ -103,15 +104,15 @@ Georg Brandl Bert Freudenberg Stian Andreassen + Edd Barrett Wanja Saatkamp Gerald Klix Mike Blume + Tobias Pape Oscar Nierstrasz Stefan H. Muller - Edd Barrett Jeremy Thurgood Rami Chowdhury - Tobias Pape Eugene Oden Henry Mason Vasily Kuznetsov @@ -137,11 +138,13 @@ Michael Twomey Lucian Branescu Mihaila Yichao Yu + Anton Gulenko Gabriel Lavoie Olivier Dormond Jared Grubb Karl Bartel Wouter van Heyst + Sebastian Pawluś Brian Dorsey Victor Stinner Andrews Medina @@ -158,6 +161,7 @@ Neil Shepperd Stanislaw Halik Mikael Schönenberg + Berkin Ilbeyi Elmo M?ntynen Jonathan David Riehl Anders Qvist @@ -181,11 +185,11 @@ Carl Meyer Karl Ramm Pieter Zieschang - Sebastian Pawluś Gabriel Lukas Vacek Andrew Dalke Sylvain Thenault + Jakub Stasiak Nathan Taylor Vladimir Kryachko Jacek Generowicz @@ -212,6 +216,7 @@ Tomo Cocoa Toni Mattis Lucas Stadler + Julian Berman roberto@goyle Yury V. Zaytsev Anna Katrina Dominguez @@ -223,6 +228,8 @@ Ben Darnell Roberto De Ioris Juan Francisco Cantero Hurtado + Ruochen Huang + Jeong YunWon Godefroid Chappelle Joshua Gilbert Dan Colish @@ -241,6 +248,7 @@ Christian Muirhead Berker Peksag James Lan + Volodymyr Vladymyrov shoma hosaka Daniel Neuhäuser Ben Mather @@ -286,6 +294,7 @@ yasirs Michael Chermside Anna Ravencroft + Andrey Churin Dan Crosta Julien Phalip Roman Podoliaka diff --git a/pypy/doc/tool/makecontributor.py b/pypy/doc/tool/makecontributor.py --- a/pypy/doc/tool/makecontributor.py +++ b/pypy/doc/tool/makecontributor.py @@ -69,6 +69,7 @@ 'Rami Chowdhury': ['necaris'], 'Stanislaw Halik':['w31rd0'], 'Wenzhu Man':['wenzhu man', 'wenzhuman'], + 'Anton Gulenko':['anton gulenko'], } alias_map = {} diff --git a/pypy/module/_cffi_backend/__init__.py b/pypy/module/_cffi_backend/__init__.py --- a/pypy/module/_cffi_backend/__init__.py +++ b/pypy/module/_cffi_backend/__init__.py @@ -2,7 +2,7 @@ from pypy.interpreter.mixedmodule import MixedModule from rpython.rlib import rdynload -VERSION = "1.0.2" +VERSION = "1.0.3" class Module(MixedModule): diff --git a/pypy/module/_cffi_backend/test/_backend_test_c.py b/pypy/module/_cffi_backend/test/_backend_test_c.py --- a/pypy/module/_cffi_backend/test/_backend_test_c.py +++ b/pypy/module/_cffi_backend/test/_backend_test_c.py @@ -3335,4 +3335,4 @@ def test_version(): # this test is here mostly for PyPy - assert __version__ == "1.0.2" + assert __version__ == "1.0.3" diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py --- a/pypy/module/_vmprof/interp_vmprof.py +++ b/pypy/module/_vmprof/interp_vmprof.py @@ -146,7 +146,7 @@ if not self.ever_enabled: if we_are_translated(): res = pypy_vmprof_init() - if not res: + if res: raise OperationError( space.w_IOError, space.wrap(rffi.charp2str(vmprof_get_error()))) diff --git a/pypy/module/_vmprof/src/vmprof.c b/pypy/module/_vmprof/src/vmprof.c --- a/pypy/module/_vmprof/src/vmprof.c +++ b/pypy/module/_vmprof/src/vmprof.c @@ -377,10 +377,6 @@ vmprof_error = dlerror(); return -1; } - if (dlclose(libhandle)) { - vmprof_error = dlerror(); - return -1; - } } return 0; } diff --git a/pypy/module/pypyjit/test_pypy_c/test_ffi.py b/pypy/module/pypyjit/test_pypy_c/test_ffi.py --- a/pypy/module/pypyjit/test_pypy_c/test_ffi.py +++ b/pypy/module/pypyjit/test_pypy_c/test_ffi.py @@ -208,6 +208,9 @@ """, ignore_ops=['guard_not_invalidated']) def test__cffi_call_c_int(self): + if sys.platform == 'win32': + py.test.skip("not tested on Windows (this test must pass on " + "other platforms, and it should work the same way)") def main(): import os try: @@ -248,6 +251,9 @@ """ % extra, ignore_ops=['guard_not_invalidated']) def test__cffi_call_size_t(self): + if sys.platform == 'win32': + py.test.skip("not tested on Windows (this test must pass on " + "other platforms, and it should work the same way)") def main(): import os try: diff --git a/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_re_python.py b/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_re_python.py --- a/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_re_python.py +++ b/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_re_python.py @@ -26,8 +26,11 @@ tmpdir.ensure(dir=1) c_file = tmpdir.join('_test_re_python.c') c_file.write(SRC) - ext = ffiplatform.get_extension(str(c_file), '_test_re_python', - export_symbols=['add42', 'globalvar42']) + ext = ffiplatform.get_extension( + str(c_file), + '_test_re_python', + export_symbols=['add42', 'add43', 'globalvar42'] + ) outputfilename = ffiplatform.compile(str(tmpdir), ext) mod.extmod = outputfilename mod.tmpdir = tmpdir diff --git a/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_verify1.py b/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_verify1.py --- a/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_verify1.py +++ b/pypy/module/test_lib_pypy/cffi_tests/cffi1/test_verify1.py @@ -1,5 +1,5 @@ # Generated by pypy/tool/import_cffi.py -import sys, math, py +import os, sys, math, py from cffi import FFI, VerificationError, VerificationMissing, model from cffi import recompiler from pypy.module.test_lib_pypy.cffi_tests.support import * diff --git a/rpython/translator/c/test/red.ico b/rpython/translator/c/test/red.ico new file mode 100644 index 0000000000000000000000000000000000000000..6b93272462ebf1acbae64f6247ce64a68858f337 GIT binary patch [cut] diff --git a/rpython/translator/platform/windows.py b/rpython/translator/platform/windows.py --- a/rpython/translator/platform/windows.py +++ b/rpython/translator/platform/windows.py @@ -417,6 +417,7 @@ deps = ['main.obj'] m.rule('wmain.c', '', ['echo #define WIN32_LEAN_AND_MEAN > $@', + 'echo #include "stdlib.h" >> $@', 'echo #include "windows.h" >> $@', 'echo int $(PYPY_MAIN_FUNCTION)(int, char*[]); >> $@', 'echo int WINAPI WinMain( >> $@', _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
