diff options
author | pierregm <pierregmcode@gmail.com> | 2010-10-11 23:02:10 +0200 |
---|---|---|
committer | pierregm <pierregmcode@gmail.com> | 2010-10-11 23:02:10 +0200 |
commit | a14dd542532d383610c1b01c5698b137dd058fea (patch) | |
tree | 036f0452ee16fe1b9b74c13e6ad9bb9155310256 /numpy/f2py/capi_maps.py | |
parent | 61d945bdb5c9b2b3329e1b8468b5c7d0596dd9fc (diff) | |
parent | 11ee694744f2552d77652ed929fdc2b4ccca6843 (diff) | |
download | numpy-a14dd542532d383610c1b01c5698b137dd058fea.tar.gz |
merging refs/remotes/origin/master into HEAD
Diffstat (limited to 'numpy/f2py/capi_maps.py')
-rw-r--r-- | numpy/f2py/capi_maps.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py index cba98af2b..c10e3ee84 100644 --- a/numpy/f2py/capi_maps.py +++ b/numpy/f2py/capi_maps.py @@ -643,8 +643,10 @@ def modsign2map(m): else: ret['interface_usercode'] = '' ret['pymethoddef'] = getpymethoddef(m) or '' - ret['coutput'] = m['coutput'] - ret['f2py_wrapper_output'] = m['f2py_wrapper_output'] + if 'coutput' in m: + ret['coutput'] = m['coutput'] + if 'f2py_wrapper_output' in m: + ret['f2py_wrapper_output'] = m['f2py_wrapper_output'] return ret def cb_sign2map(a,var,index=None): |