Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r63278:9f9aee523a00 Date: 2013-04-12 14:12 +0200 http://bitbucket.org/pypy/pypy/changeset/9f9aee523a00/
Log: merge heads diff --git a/pypy/doc/index.rst b/pypy/doc/index.rst --- a/pypy/doc/index.rst +++ b/pypy/doc/index.rst @@ -31,6 +31,7 @@ .. _`Starting with RPython`: getting-started-dev.html .. _`how to contribute`: how-to-contribute.html .. _`PyPy website`: http://pypy.org +.. _`LICENSE`: https://bitbucket.org/pypy/pypy/src/default/LICENSE Index of various topics: ======================== @@ -66,11 +67,9 @@ * `Sandboxing Python code`_ * `Garbage collection environment variables`_ -Status_ of the project. - .. _`Differences between PyPy and CPython`: cpython_differences.html .. _`What PyPy can do for your objects`: objspace-proxies.html -.. _`Continulets and greenlets_`: stackless.html +.. _`Continulets and greenlets`: stackless.html .. _`JIT Generation in PyPy`: jit/index.html .. _`JIT hooks`: jit-hooks.html .. _`Sandboxing Python code`: sandbox.html 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 @@ -1,6 +1,6 @@ import sys import weakref -import os.path +import os import py @@ -19,6 +19,14 @@ from rpython.tool.identity_dict import identity_dict from rpython.tool import leakfinder +if os.name == 'nt': + # Do not open dreaded dialog box on segfault + import ctypes + SEM_NOGPFAULTERRORBOX = 0x0002 # From MSDN + old_err_mode = ctypes.windll.kernel32.GetErrorMode() + new_err_mode = old_err_mode | SEM_NOGPFAULTERRORBOX + ctypes.windll.kernel32.SetErrorMode(new_err_mode) + @api.cpython_api([], api.PyObject) def PyPy_Crash1(space): 1/0 diff --git a/rpython/rlib/test/test_rsocket.py b/rpython/rlib/test/test_rsocket.py --- a/rpython/rlib/test/test_rsocket.py +++ b/rpython/rlib/test/test_rsocket.py @@ -165,8 +165,12 @@ s2 = RSocket(AF_INET, SOCK_STREAM) s2.settimeout(10.0) # test one side with timeouts so select is used, shouldn't affect test def connecting(): - s2.connect(addr) - lock.release() + try: + s2.connect(addr) + lock.release() + except: + import traceback + traceback.print_exc() lock = thread.allocate_lock() lock.acquire() thread.start_new_thread(connecting, ()) @@ -174,6 +178,7 @@ fd1, addr2 = sock.accept() s1 = RSocket(fd=fd1) print 'connection accepted' + assert not lock.locked() lock.acquire() print 'connecting side knows that the connection was accepted too' assert addr.eq(s2.getpeername()) _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit
