Author: Armin Rigo <[email protected]>
Branch:
Changeset: r68898:2f6abb55cbfd
Date: 2014-01-24 10:17 +0100
http://bitbucket.org/pypy/pypy/changeset/2f6abb55cbfd/
Log: Import directly "_rawffi.alt" from here
diff --git a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
--- a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
@@ -7,9 +7,9 @@
from rpython.rlib.test.test_clibffi import get_libm_name
def main(libm_name):
try:
- from _ffi import CDLL, types
+ from _rawffi.alt import CDLL, types
except ImportError:
- sys.stderr.write('SKIP: cannot import _ffi\n')
+ sys.stderr.write('SKIP: cannot import _rawffi.alt\n')
return 0
libm = CDLL(libm_name)
@@ -45,9 +45,9 @@
from rpython.rlib.test.test_clibffi import get_libm_name
def main(libm_name):
try:
- from _ffi import CDLL, types
+ from _rawffi.alt import CDLL, types
except ImportError:
- sys.stderr.write('SKIP: cannot import _ffi\n')
+ sys.stderr.write('SKIP: cannot import _rawffi.alt\n')
return 0
libm = CDLL(libm_name)
@@ -82,12 +82,12 @@
from threading import Thread
#
if os.name == 'nt':
- from _ffi import WinDLL, types
+ from _rawffi.alt import WinDLL, types
libc = WinDLL('Kernel32.dll')
sleep = libc.getfunc('Sleep', [types.uint], types.uint)
delays = [0]*n + [1000]
else:
- from _ffi import CDLL, types
+ from _rawffi.alt import CDLL, types
libc = CDLL(libc_name)
sleep = libc.getfunc('sleep', [types.uint], types.uint)
delays = [0]*n + [1]
@@ -144,7 +144,7 @@
def test__ffi_struct(self):
def main():
- from _ffi import _StructDescr, Field, types
+ from _rawffi.alt import _StructDescr, Field, types
fields = [
Field('x', types.slong),
]
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
