Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.5
Changeset: r92886:81a7e5dcbc2d
Date: 2017-10-30 19:10 +0200
http://bitbucket.org/pypy/pypy/changeset/81a7e5dcbc2d/
Log: fix merge quirks, document merged branch
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -11,3 +11,6 @@
.. branch: py3.5-appexec
Raise if space.is_true(space.appexec()) used in app level tests, fix tests
that did this
+
+.. branch: py3.5-mac-embedding
+Download and patch dependencies when building cffi-based stdlib modules
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -1864,7 +1864,7 @@
def sched_yield():
return handle_posix_error('sched_yield', c_sched_yield())
-
+
#___________________________________________________________________
c_chroot = external('chroot', [rffi.CCHARP], rffi.INT,
diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py
--- a/rpython/rlib/test/test_rposix.py
+++ b/rpython/rlib/test/test_rposix.py
@@ -810,11 +810,6 @@
assert isinstance(low, int) == True
assert isinstance(high, int) == True
assert high > low
-
-@rposix_requires('sched_yield')
-def test_sched_yield():
- if sys.platform != 'win32':
- rposix.sched_yield()
@rposix_requires('sched_yield')
def test_sched_yield():
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
