Author: Armin Rigo <[email protected]>
Branch: cffi-1.0
Changeset: r76991:236d9c2a8cf1
Date: 2015-05-02 22:25 +0200
http://bitbucket.org/pypy/pypy/changeset/236d9c2a8cf1/
Log: more cases in ffi_type()
diff --git a/pypy/module/_cffi_backend/ffi_obj.py
b/pypy/module/_cffi_backend/ffi_obj.py
--- a/pypy/module/_cffi_backend/ffi_obj.py
+++ b/pypy/module/_cffi_backend/ffi_obj.py
@@ -5,6 +5,8 @@
from pypy.module._cffi_backend import parse_c_type, realize_c_type
from pypy.module._cffi_backend import newtype
+from pypy.module._cffi_backend.ctypeobj import W_CType
+from pypy.module._cffi_backend.cdataobj import W_CData
ACCEPT_STRING = 1
@@ -48,6 +50,10 @@
space = self.space
if (accept & ACCEPT_STRING) and space.isinstance_w(w_x, space.w_str):
return self.parse_string_to_type(space.str_w(w_x))
+ if (accept & ACCEPT_CTYPE) and isinstance(w_x, W_CType):
+ return w_x
+ if (accept & ACCEPT_CDATA) and isinstance(w_x, W_CData):
+ return w_x.ctype
yyyy
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
