summaryrefslogtreecommitdiff
path: root/numpy/f2py/common_rules.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-08-18 11:51:25 -0600
committerCharles Harris <charlesr.harris@gmail.com>2013-08-18 11:51:25 -0600
commitfbd6510d58a47ea0d166c48a82793f05425406e4 (patch)
tree330ce703eb02d20f96099c3fe0fc36ae33d4905b /numpy/f2py/common_rules.py
parent8ddb0ce0acafe75d78df528b4d2540dfbf4b364d (diff)
downloadnumpy-fbd6510d58a47ea0d166c48a82793f05425406e4.tar.gz
STY: Giant comma spacing fixup.
Run the 2to3 ws_comma fixer on *.py files. Some lines are now too long and will need to be broken at some point. OTOH, some lines were already too long and need to be broken at some point. Now seems as good a time as any to do this with open PRs at a minimum.
Diffstat (limited to 'numpy/f2py/common_rules.py')
-rw-r--r--numpy/f2py/common_rules.py46
1 files changed, 23 insertions, 23 deletions
diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py
index dd44e3326..d3b7f6dc2 100644
--- a/numpy/f2py/common_rules.py
+++ b/numpy/f2py/common_rules.py
@@ -39,10 +39,10 @@ def findcommonblocks(block,top=1):
vars={}
for v in block['common'][n]:
vars[v]=block['vars'][v]
- ret.append((n,block['common'][n],vars))
+ ret.append((n, block['common'][n], vars))
elif hasbody(block):
for b in block['body']:
- ret=ret+findcommonblocks(b,0)
+ ret=ret+findcommonblocks(b, 0)
if top:
tret=[]
names=[]
@@ -56,31 +56,31 @@ def findcommonblocks(block,top=1):
def buildhooks(m):
ret = {'commonhooks':[],'initcommonhooks':[],'docs':['"COMMON blocks:\\n"']}
fwrap = ['']
- def fadd(line,s=fwrap): s[0] = '%s\n %s'%(s[0],line)
+ def fadd(line,s=fwrap): s[0] = '%s\n %s'%(s[0], line)
chooks = ['']
- def cadd(line,s=chooks): s[0] = '%s\n%s'%(s[0],line)
+ def cadd(line,s=chooks): s[0] = '%s\n%s'%(s[0], line)
ihooks = ['']
- def iadd(line,s=ihooks): s[0] = '%s\n%s'%(s[0],line)
+ def iadd(line,s=ihooks): s[0] = '%s\n%s'%(s[0], line)
doc = ['']
- def dadd(line,s=doc): s[0] = '%s\n%s'%(s[0],line)
- for (name,vnames,vars) in findcommonblocks(m):
+ def dadd(line,s=doc): s[0] = '%s\n%s'%(s[0], line)
+ for (name, vnames, vars) in findcommonblocks(m):
lower_name = name.lower()
- hnames,inames = [],[]
+ hnames, inames = [], []
for n in vnames:
if isintent_hide(vars[n]): hnames.append(n)
else: inames.append(n)
if hnames:
- outmess('\t\tConstructing COMMON block support for "%s"...\n\t\t %s\n\t\t Hidden: %s\n'%(name,','.join(inames),','.join(hnames)))
+ outmess('\t\tConstructing COMMON block support for "%s"...\n\t\t %s\n\t\t Hidden: %s\n'%(name, ','.join(inames), ','.join(hnames)))
else:
- outmess('\t\tConstructing COMMON block support for "%s"...\n\t\t %s\n'%(name,','.join(inames)))
+ outmess('\t\tConstructing COMMON block support for "%s"...\n\t\t %s\n'%(name, ','.join(inames)))
fadd('subroutine f2pyinit%s(setupfunc)'%name)
fadd('external setupfunc')
for n in vnames:
- fadd(func2subr.var2fixfortran(vars,n))
+ fadd(func2subr.var2fixfortran(vars, n))
if name=='_BLNK_':
fadd('common %s'%(','.join(vnames)))
else:
- fadd('common /%s/ %s'%(name,','.join(vnames)))
+ fadd('common /%s/ %s'%(name, ','.join(vnames)))
fadd('call setupfunc(%s)'%(','.join(inames)))
fadd('end\n')
cadd('static FortranDataDef f2py_%s_def[] = {'%(name))
@@ -88,45 +88,45 @@ def buildhooks(m):
for n in inames:
ct = capi_maps.getctype(vars[n])
at = capi_maps.c2capi_map[ct]
- dm = capi_maps.getarrdims(n,vars[n])
+ dm = capi_maps.getarrdims(n, vars[n])
if dm['dims']: idims.append('(%s)'%(dm['dims']))
else: idims.append('')
dms=dm['dims'].strip()
if not dms: dms='-1'
- cadd('\t{\"%s\",%s,{{%s}},%s},'%(n,dm['rank'],dms,at))
+ cadd('\t{\"%s\",%s,{{%s}},%s},'%(n, dm['rank'], dms, at))
cadd('\t{NULL}\n};')
inames1 = rmbadname(inames)
inames1_tps = ','.join(['char *'+s for s in inames1])
- cadd('static void f2py_setup_%s(%s) {'%(name,inames1_tps))
+ cadd('static void f2py_setup_%s(%s) {'%(name, inames1_tps))
cadd('\tint i_f2py=0;')
for n in inames1:
- cadd('\tf2py_%s_def[i_f2py++].data = %s;'%(name,n))
+ cadd('\tf2py_%s_def[i_f2py++].data = %s;'%(name, n))
cadd('}')
if '_' in lower_name:
F_FUNC='F_FUNC_US'
else:
F_FUNC='F_FUNC'
cadd('extern void %s(f2pyinit%s,F2PYINIT%s)(void(*)(%s));'\
- %(F_FUNC,lower_name,name.upper(),
+ %(F_FUNC, lower_name, name.upper(),
','.join(['char*']*len(inames1))))
cadd('static void f2py_init_%s(void) {'%name)
cadd('\t%s(f2pyinit%s,F2PYINIT%s)(f2py_setup_%s);'\
- %(F_FUNC,lower_name,name.upper(),name))
+ %(F_FUNC, lower_name, name.upper(), name))
cadd('}\n')
- iadd('\tF2PyDict_SetItemString(d, \"%s\", PyFortranObject_New(f2py_%s_def,f2py_init_%s));'%(name,name,name))
- tname = name.replace('_','\\_')
+ iadd('\tF2PyDict_SetItemString(d, \"%s\", PyFortranObject_New(f2py_%s_def,f2py_init_%s));'%(name, name, name))
+ tname = name.replace('_', '\\_')
dadd('\\subsection{Common block \\texttt{%s}}\n'%(tname))
dadd('\\begin{description}')
for n in inames:
- dadd('\\item[]{{}\\verb@%s@{}}'%(capi_maps.getarrdocsign(n,vars[n])))
+ dadd('\\item[]{{}\\verb@%s@{}}'%(capi_maps.getarrdocsign(n, vars[n])))
if hasnote(vars[n]):
note = vars[n]['note']
if isinstance(note, list): note='\n'.join(note)
dadd('--- %s'%(note))
dadd('\\end{description}')
- ret['docs'].append('"\t/%s/ %s\\n"'%(name,','.join(map(lambda v,d:v+d,inames,idims))))
+ ret['docs'].append('"\t/%s/ %s\\n"'%(name, ','.join(map(lambda v, d:v+d, inames, idims))))
ret['commonhooks']=chooks
ret['initcommonhooks']=ihooks
ret['latexdoc']=doc[0]
if len(ret['docs'])<=1: ret['docs']=''
- return ret,fwrap[0]
+ return ret, fwrap[0]