diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2010-02-25 05:20:51 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2010-02-25 05:20:51 +0000 |
| commit | f3580687a3f3752a8a8bebbcbe5b594055beb299 (patch) | |
| tree | 116f28c4d47f23a0cfaec37050bfe93cf42ecf44 /numpy/f2py/rules.py | |
| parent | 9596a895dd01c27b9984fe8ff20e151eda41b9b8 (diff) | |
| download | numpy-f3580687a3f3752a8a8bebbcbe5b594055beb299.tar.gz | |
ENH: Add support for PyCapsule.
Diffstat (limited to 'numpy/f2py/rules.py')
| -rw-r--r-- | numpy/f2py/rules.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py index ef4b9cc34..e4fb61d81 100644 --- a/numpy/f2py/rules.py +++ b/numpy/f2py/rules.py @@ -392,7 +392,7 @@ rout_rules=[ { extern #ctype# #F_FUNC#(#name_lower#,#NAME#)(void); PyObject* o = PyDict_GetItemString(d,"#name#"); - PyObject_SetAttrString(o,"_cpointer", PyCObject_FromVoidPtr((void*)#F_FUNC#(#name_lower#,#NAME#),NULL)); + PyObject_SetAttrString(o,"_cpointer", F2PyCapsule_FromVoidPtr((void*)#F_FUNC#(#name_lower#,#NAME#),NULL)); } '''}, 'need':{l_not(l_or(ismoduleroutine,isdummyroutine)):['F_WRAPPEDFUNC','F_FUNC']}, @@ -686,8 +686,8 @@ arg_rules=[ }, { 'frompyobj':[{l_not(isintent_callback):"""\ -if(PyCObject_Check(#varname#_capi)) { - #varname#_cptr = PyCObject_AsVoidPtr(#varname#_capi); +if(F2PyCapsule_Check(#varname#_capi)) { + #varname#_cptr = F2PyCapsule_AsVoidPtr(#varname#_capi); } else { #varname#_cptr = #cbname#; } |