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

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.3
Changeset: r72500:38d2f98adca7
Date: 2014-07-26 13:57 +0200
http://bitbucket.org/pypy/pypy/changeset/38d2f98adca7/

Log:	merge heads

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
@@ -17,7 +17,7 @@
     usemodules = ['binascii', 'posix', 'signal', 'struct', 'rctime']
     # py3k os.open uses subprocess, requiring the following per platform
     if os.name != 'nt':
-        usemodules += ['fcntl', 'select']
+        usemodules += ['fcntl', 'select', '_posixsubprocess']
     else:
         usemodules += ['_rawffi', 'thread']
     mod.space = gettestobjspace(usemodules=usemodules)