Author: Armin Rigo <[email protected]>
Branch:
Changeset: r77422:2393164cb0c5
Date: 2015-05-20 10:45 +0200
http://bitbucket.org/pypy/pypy/changeset/2393164cb0c5/
Log: Fix for cpyext's test_ztranslation: don't import _cffi_backend from
the same function
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -1110,6 +1110,10 @@
trunk_include = pypydir.dirpath() / 'include'
copy_header_files(trunk_include)
+def _load_from_cffi(space, name, path, initptr):
+ from pypy.module._cffi_backend import cffi1_module
+ cffi1_module.load_cffi1_module(space, name, path, initptr)
+
@unwrap_spec(path=str, name=str)
def load_extension_module(space, path, name):
# note: this is used both to load CPython-API-style C extension
@@ -1142,8 +1146,7 @@
pass
else:
try:
- from pypy.module._cffi_backend import cffi1_module
- cffi1_module.load_cffi1_module(space, name, path, initptr)
+ _load_from_cffi(space, name, path, initptr)
except:
rdynload.dlclose(dll)
raise
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
