Author: Brian Kearns <[email protected]>
Branch:
Changeset: r70025:d3abcc897136
Date: 2014-03-17 16:18 -0400
http://bitbucket.org/pypy/pypy/changeset/d3abcc897136/
Log: merge heads
diff --git a/pypy/module/_multiprocessing/test/test_connection.py
b/pypy/module/_multiprocessing/test/test_connection.py
--- a/pypy/module/_multiprocessing/test/test_connection.py
+++ b/pypy/module/_multiprocessing/test/test_connection.py
@@ -9,8 +9,12 @@
class AppTestBufferTooShort:
spaceconfig = {'usemodules': ['_multiprocessing', 'thread', 'signal',
- 'itertools', 'select', 'fcntl', 'struct',
- 'binascii']}
+ 'itertools', 'select', 'struct', 'binascii']}
+ if sys.platform == 'win32':
+ spaceconfig['usemodules'].append('_rawffi')
+ else:
+ spaceconfig['usemodules'].append('fcntl')
+
def setup_class(cls):
if cls.runappdirect:
@@ -75,6 +79,8 @@
'itertools', '_socket', 'binascii',
]
}
+ if sys.platform == 'win32':
+ spaceconfig['usemodules'].append('_rawffi')
def setup_class(cls):
if sys.platform != "win32":
@@ -86,7 +92,6 @@
# just for multiprocessing to import correctly on Windows
w_modules = space.sys.get('modules')
space.setitem(w_modules, space.wrap('msvcrt'), space.sys)
- space.setitem(w_modules, space.wrap('_subprocess'), space.sys)
else:
import _multiprocessing
@@ -100,9 +105,12 @@
spaceconfig = {
"usemodules": [
'_multiprocessing', 'thread', 'signal', 'struct', 'array',
- 'itertools', '_socket', 'binascii', 'select', 'fcntl',
- ]
+ 'itertools', '_socket', 'binascii', 'select' ]
}
+ if sys.platform == 'win32':
+ spaceconfig['usemodules'].append('_rawffi')
+ else:
+ spaceconfig['usemodules'].append('fcntl')
def setup_class(cls):
cls.w_connections = cls.space.newlist([])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
