diff options
Diffstat (limited to 'numpy/f2py/auxfuncs.py')
| -rw-r--r-- | numpy/f2py/auxfuncs.py | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py index b7d32976a..e391430f5 100644 --- a/numpy/f2py/auxfuncs.py +++ b/numpy/f2py/auxfuncs.py @@ -16,17 +16,16 @@ Pearu Peterson """ from __future__ import division, absolute_import, print_function -__version__ = "$Revision: 1.65 $"[10:-1] - -from . import __version__ -f2py_version = __version__.version - import pprint import sys import types from functools import reduce + +from . import __version__ from . import cfuncs +f2py_version = __version__.version + errmess=sys.stderr.write #outmess=sys.stdout.write @@ -599,7 +598,7 @@ def gentitle(name): return '/*%s %s %s*/'%(l*'*',name,l*'*') def flatlist(l): - if type(l)==types.ListType: + if type(l)==list: return reduce(lambda x,y,f=flatlist:x+f(y),l,[]) return [l] @@ -608,9 +607,9 @@ def stripcomma(s): return s def replace(str,d,defaultsep=''): - if type(d)==types.ListType: + if type(d)==list: return [replace(str, _m, defaultsep) for _m in d] - if type(str)==types.ListType: + if type(str)==list: return [replace(_m, d, defaultsep) for _m in str] for k in 2*list(d.keys()): if k=='separatorsfor': @@ -619,14 +618,14 @@ def replace(str,d,defaultsep=''): sep=d['separatorsfor'][k] else: sep=defaultsep - if type(d[k])==types.ListType: + if type(d[k])==list: str=str.replace('#%s#'%(k),sep.join(flatlist(d[k]))) else: str=str.replace('#%s#'%(k),d[k]) return str def dictappend(rd,ar): - if type(ar)==types.ListType: + if type(ar)==list: for a in ar: rd=dictappend(rd,a) return rd @@ -636,13 +635,13 @@ def dictappend(rd,ar): if k in rd: if type(rd[k])==str: rd[k]=[rd[k]] - if type(rd[k])==types.ListType: - if type(ar[k])==types.ListType: + if type(rd[k])==list: + if type(ar[k])==list: rd[k]=rd[k]+ar[k] else: rd[k].append(ar[k]) - elif type(rd[k])==types.DictType: - if type(ar[k])==types.DictType: + elif type(rd[k])==dict: + if type(ar[k])==dict: if k=='separatorsfor': for k1 in ar[k].keys(): if k1 not in rd[k]: @@ -655,7 +654,7 @@ def dictappend(rd,ar): def applyrules(rules,d,var={}): ret={} - if type(rules)==types.ListType: + if type(rules)==list: for r in rules: rr=applyrules(r,d,var) ret=dictappend(ret,rr) @@ -674,7 +673,7 @@ def applyrules(rules,d,var={}): ret[k]=rules[k]; continue if type(rules[k])==str: ret[k]=replace(rules[k],d) - elif type(rules[k])==types.ListType: + elif type(rules[k])==list: ret[k]=[] for i in rules[k]: ar=applyrules({k:i},d,var) @@ -682,13 +681,13 @@ def applyrules(rules,d,var={}): ret[k].append(ar[k]) elif k[0]=='_': continue - elif type(rules[k])==types.DictType: + elif type(rules[k])==dict: ret[k]=[] for k1 in rules[k].keys(): if type(k1)==types.FunctionType and k1(var): - if type(rules[k][k1])==types.ListType: + if type(rules[k][k1])==list: for i in rules[k][k1]: - if type(i)==types.DictType: + if type(i)==dict: res=applyrules({'supertext':i},d,var) if 'supertext' in res: i=res['supertext'] @@ -696,7 +695,7 @@ def applyrules(rules,d,var={}): ret[k].append(replace(i,d)) else: i=rules[k][k1] - if type(i)==types.DictType: + if type(i)==dict: res=applyrules({'supertext':i},d) if 'supertext' in res: i=res['supertext'] @@ -704,7 +703,7 @@ def applyrules(rules,d,var={}): ret[k].append(replace(i,d)) else: errmess('applyrules: ignoring rule %s.\n'%repr(rules[k])) - if type(ret[k])==types.ListType: + if type(ret[k])==list: if len(ret[k])==1: ret[k]=ret[k][0] if ret[k]==[]: |