Author: Dan Villiom Podlaski Christiansen <d...@magenta.dk>
Branch: py3.5
Changeset: r91479:86914a929334
Date: 2017-05-31 22:05 +0200
http://bitbucket.org/pypy/pypy/changeset/86914a929334/
Log: Fix translation on OS X (and likely FreeBSD as well)
BSDs don't provide SCHED_BATCH, so remove the assert that checks for
its presence.
diff --git a/pypy/module/posix/__init__.py b/pypy/module/posix/__init__.py
--- a/pypy/module/posix/__init__.py
+++ b/pypy/module/posix/__init__.py
@@ -235,8 +235,8 @@
interpleveldefs['sched_get_priority_min'] =
'interp_posix.sched_get_priority_min'
for _name in ['SCHED_FIFO', 'SCHED_RR', 'SCHED_OTHER',
'SCHED_BATCH']:
- assert getattr(rposix, _name) is not None, "missing %r" % (_name,)
- interpleveldefs[_name] = 'space.wrap(%d)' % getattr(rposix, _name)
+ if getattr(rposix, _name) is not None:
+ interpleveldefs[_name] = 'space.wrap(%d)' % getattr(rposix,
_name)
for _name in ["O_CLOEXEC"]:
if getattr(rposix, _name) is not None:
diff --git a/pypy/module/posix/test/test_posix2.py
b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -944,7 +944,8 @@
assert posix.sched_get_priority_max(posix.SCHED_FIFO) != -1
assert posix.sched_get_priority_max(posix.SCHED_RR) != -1
assert posix.sched_get_priority_max(posix.SCHED_OTHER) != -1
- assert posix.sched_get_priority_max(posix.SCHED_BATCH) != -1
+ if getattr(posix, 'SCHED_BATCH', None):
+ assert posix.sched_get_priority_max(posix.SCHED_BATCH) != -1
if hasattr(rposix, 'sched_get_priority_min'):
def test_os_sched_get_priority_min(self):
@@ -953,7 +954,8 @@
assert posix.sched_get_priority_min(posix.SCHED_FIFO) != -1
assert posix.sched_get_priority_min(posix.SCHED_RR) != -1
assert posix.sched_get_priority_min(posix.SCHED_OTHER) != -1
- assert posix.sched_get_priority_min(posix.SCHED_BATCH) != -1
+ if getattr(posix, 'SCHED_BATCH', None):
+ assert posix.sched_get_priority_min(posix.SCHED_BATCH) != -1
if hasattr(rposix, 'sched_get_priority_min'):
def test_os_sched_priority_max_greater_than_min(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
