[pypy-commit] pypy py3.5: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r87827:3ced7022e9b5
Date: 2016-10-16 10:18 +0200
http://bitbucket.org/pypy/pypy/changeset/3ced7022e9b5/

Log:	merge heads

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -2213,7 +2213,7 @@
     return space.call_function(w_terminal_size, w_tuple)
 
 def cpu_count(space):
-    count = intmask(rposix.cpu_count())
+    count = rposix.cpu_count()
     if count <= 0:
         return space.w_None
     return space.wrap(count)