diff options
| author | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:13:57 +0000 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2010-02-20 18:13:57 +0000 |
| commit | 10985dc3458acd9d3286988dec1a27ece5cac25d (patch) | |
| tree | 360f572b5cd6dd4f081450fb9d121feda8666832 | |
| parent | 04d09a4c763e2d18c5939002d2390a607a75a05a (diff) | |
| download | numpy-10985dc3458acd9d3286988dec1a27ece5cac25d.tar.gz | |
3K: f2py: break cyclic imports (which are not allowed on Py3) by moving them to functions
| -rw-r--r-- | numpy/f2py/cb_rules.py | 3 | ||||
| -rw-r--r-- | numpy/f2py/f90mod_rules.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py index c8f9f2c41..ce297ed79 100644 --- a/numpy/f2py/cb_rules.py +++ b/numpy/f2py/cb_rules.py @@ -27,7 +27,6 @@ outmess=sys.stdout.write show=pprint.pprint from auxfuncs import * -import capi_maps import cfuncs ################## Rules for callback function ############## @@ -415,6 +414,8 @@ def buildcallbacks(m): def buildcallback(rout,um): global cb_map + import capi_maps + outmess('\tConstructing call-back function "cb_%s_in_%s"\n'%(rout['name'],um)) args,depargs=getargs(rout) capi_maps.depargs=depargs diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py index f494d43c0..6ce9b15ca 100644 --- a/numpy/f2py/f90mod_rules.py +++ b/numpy/f2py/f90mod_rules.py @@ -26,7 +26,6 @@ show=pprint.pprint from auxfuncs import * import numpy as np import capi_maps -import rules import func2subr from crackfortran import undo_rmbadname, undo_rmbadname1 @@ -83,6 +82,7 @@ fgetdims2_sa="""\ def buildhooks(pymod): global fgetdims1,fgetdims2 + import rules ret = {'f90modhooks':[],'initf90modhooks':[],'body':[], 'need':['F_FUNC','arrayobject.h'], 'separatorsfor':{'includes0':'\n','includes':'\n'}, |