From a0121573e6685f09e5f613280d616070b8ff99cb Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Sat, 25 Jul 2015 22:49:53 -0600 Subject: STY: Make PEP8 fixes in numpy/f2py Decided to bite the bullet on this one. The code is certainly more readable, so should be easier to fix if we need to. --- numpy/f2py/use_rules.py | 81 +++++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 36 deletions(-) (limited to 'numpy/f2py/use_rules.py') diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py index 8c87de745..6f44f1634 100644 --- a/numpy/f2py/use_rules.py +++ b/numpy/f2py/use_rules.py @@ -19,16 +19,16 @@ from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.3 $"[10:-1] -f2py_version='See `f2py -v`' +f2py_version = 'See `f2py -v`' from .auxfuncs import ( - applyrules,dictappend, gentitle, hasnote, outmess + applyrules, dictappend, gentitle, hasnote, outmess ) -usemodule_rules={ - 'body':""" +usemodule_rules = { + 'body': """ #begintitle# static char doc_#apiname#[] = \"\\\nVariable wrapper signature:\\n\\ \t #name# = get_#name#()\\n\\ @@ -44,61 +44,70 @@ capi_fail: \treturn NULL; } """, - 'method':'\t{\"get_#name#\",#apiname#,METH_VARARGS|METH_KEYWORDS,doc_#apiname#},', - 'need':['F_MODFUNC'] - } + 'method': '\t{\"get_#name#\",#apiname#,METH_VARARGS|METH_KEYWORDS,doc_#apiname#},', + 'need': ['F_MODFUNC'] +} ################ + def buildusevars(m, r): - ret={} - outmess('\t\tBuilding use variable hooks for module "%s" (feature only for F90/F95)...\n'%(m['name'])) - varsmap={} - revmap={} + ret = {} + outmess( + '\t\tBuilding use variable hooks for module "%s" (feature only for F90/F95)...\n' % (m['name'])) + varsmap = {} + revmap = {} if 'map' in r: for k in r['map'].keys(): if r['map'][k] in revmap: - outmess('\t\t\tVariable "%s<=%s" is already mapped by "%s". Skipping.\n'%(r['map'][k], k, revmap[r['map'][k]])) + outmess('\t\t\tVariable "%s<=%s" is already mapped by "%s". Skipping.\n' % ( + r['map'][k], k, revmap[r['map'][k]])) else: - revmap[r['map'][k]]=k + revmap[r['map'][k]] = k if 'only' in r and r['only']: for v in r['map'].keys(): if r['map'][v] in m['vars']: - if revmap[r['map'][v]]==v: - varsmap[v]=r['map'][v] + if revmap[r['map'][v]] == v: + varsmap[v] = r['map'][v] else: - outmess('\t\t\tIgnoring map "%s=>%s". See above.\n'%(v, r['map'][v])) + outmess('\t\t\tIgnoring map "%s=>%s". See above.\n' % + (v, r['map'][v])) else: - outmess('\t\t\tNo definition for variable "%s=>%s". Skipping.\n'%(v, r['map'][v])) + outmess( + '\t\t\tNo definition for variable "%s=>%s". Skipping.\n' % (v, r['map'][v])) else: for v in m['vars'].keys(): if v in revmap: - varsmap[v]=revmap[v] + varsmap[v] = revmap[v] else: - varsmap[v]=v + varsmap[v] = v for v in varsmap.keys(): - ret=dictappend(ret, buildusevar(v, varsmap[v], m['vars'], m['name'])) + ret = dictappend(ret, buildusevar(v, varsmap[v], m['vars'], m['name'])) return ret + + def buildusevar(name, realname, vars, usemodulename): - outmess('\t\t\tConstructing wrapper function for variable "%s=>%s"...\n'%(name, realname)) - ret={} - vrd={'name':name, - 'realname':realname, - 'REALNAME':realname.upper(), - 'usemodulename':usemodulename, - 'USEMODULENAME':usemodulename.upper(), - 'texname':name.replace('_', '\\_'), - 'begintitle':gentitle('%s=>%s'%(name, realname)), - 'endtitle':gentitle('end of %s=>%s'%(name, realname)), - 'apiname':'#modulename#_use_%s_from_%s'%(realname, usemodulename) - } - nummap={0:'Ro',1:'Ri',2:'Rii',3:'Riii',4:'Riv',5:'Rv',6:'Rvi',7:'Rvii',8:'Rviii',9:'Rix'} - vrd['texnamename']=name + outmess('\t\t\tConstructing wrapper function for variable "%s=>%s"...\n' % ( + name, realname)) + ret = {} + vrd = {'name': name, + 'realname': realname, + 'REALNAME': realname.upper(), + 'usemodulename': usemodulename, + 'USEMODULENAME': usemodulename.upper(), + 'texname': name.replace('_', '\\_'), + 'begintitle': gentitle('%s=>%s' % (name, realname)), + 'endtitle': gentitle('end of %s=>%s' % (name, realname)), + 'apiname': '#modulename#_use_%s_from_%s' % (realname, usemodulename) + } + nummap = {0: 'Ro', 1: 'Ri', 2: 'Rii', 3: 'Riii', 4: 'Riv', + 5: 'Rv', 6: 'Rvi', 7: 'Rvii', 8: 'Rviii', 9: 'Rix'} + vrd['texnamename'] = name for i in nummap.keys(): - vrd['texnamename']=vrd['texnamename'].replace(repr(i), nummap[i]) + vrd['texnamename'] = vrd['texnamename'].replace(repr(i), nummap[i]) if hasnote(vars[realname]): - vrd['note']=vars[realname]['note'] + vrd['note'] = vars[realname]['note'] rd = dictappend({}, vrd) print(name, realname, vars[realname]) -- cgit v1.2.1