Author: Stefano Rivera <[email protected]>
Branch: split-verify
Changeset: r1363:a983c3e85b1c
Date: 2013-10-06 19:28 +0200
http://bitbucket.org/cffi/cffi/changeset/a983c3e85b1c/
Log: Port distutils_module to FFIBuilder
diff --git a/testing/snippets/distutils_module/ffibuilder.py
b/testing/snippets/distutils_module/ffibuilder.py
new file mode 100644
--- /dev/null
+++ b/testing/snippets/distutils_module/ffibuilder.py
@@ -0,0 +1,21 @@
+import sys
+
+from cffi import FFIBuilder
+
+
+def build_ffi(path):
+ builder = FFIBuilder('snip_basic_module', path)
+ builder.cdef(""" // some declarations from the man page
+ struct passwd {
+ char *pw_name;
+ ...;
+ };
+ struct passwd *getpwuid(int uid);
+ """)
+ builder.makelib('passwd', """ // passed to the real C compiler
+ #include <sys/types.h>
+ #include <pwd.h>
+ """, libraries=[], # or a list of libraries to link with
+ force_generic_engine=hasattr(sys, '_force_generic_engine_'))
+ builder.write_ffi_module()
+ return builder.list_built_files()
diff --git a/testing/snippets/distutils_module/setup.py
b/testing/snippets/distutils_module/setup.py
--- a/testing/snippets/distutils_module/setup.py
+++ b/testing/snippets/distutils_module/setup.py
@@ -1,7 +1,10 @@
+from distutils.core import setup
-from distutils.core import setup
-import snip_basic_verify
+from cffi.packaging import FFIExtension, build_ext
+
+import ffibuilder
setup(
- py_modules=['snip_basic_verify'],
- ext_modules=[snip_basic_verify.ffi.verifier.get_extension()])
+ ext_modules=[FFIExtension(ffibuilder.build_ffi)],
+ cmdclass={'build_ext': build_ext},
+)
diff --git a/testing/snippets/distutils_module/snip_basic_verify.py
b/testing/snippets/distutils_module/snip_basic_verify.py
deleted file mode 100644
--- a/testing/snippets/distutils_module/snip_basic_verify.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-from cffi import FFI
-import sys
-
-ffi = FFI()
-ffi.cdef(""" // some declarations from the man page
- struct passwd {
- char *pw_name;
- ...;
- };
- struct passwd *getpwuid(int uid);
-""")
-C = ffi.verify(""" // passed to the real C compiler
-#include <sys/types.h>
-#include <pwd.h>
-""", libraries=[], # or a list of libraries to link with
- force_generic_engine=hasattr(sys, '_force_generic_engine_'))
diff --git a/testing/test_zintegration.py b/testing/test_zintegration.py
--- a/testing/test_zintegration.py
+++ b/testing/test_zintegration.py
@@ -92,9 +92,10 @@
def test_distutils_module():
run_setup_and_program("distutils_module", '''
- import snip_basic_verify
- p = snip_basic_verify.C.getpwuid(0)
- assert snip_basic_verify.ffi.string(p.pw_name) == b"root"
+ import snip_basic_module
+ lib = snip_basic_module.load_passwd()
+ p = lib.getpwuid(0)
+ assert snip_basic_module.string(p.pw_name) == b"root"
''')
def test_distutils_package_1():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
