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.

1 files changed, 82 insertions, 67 deletions

diff --git a/numpy/f2py/func2subr.py b/numpy/f2py/func2subr.py
index 39410feef..723d6508e 100644
--- a/numpy/f2py/func2subr.py
+++ b/numpy/f2py/func2subr.py
@@ -23,60 +23,61 @@ import copy
 
 from .auxfuncs import (
     getfortranname, isexternal, isfunction, isfunction_wrap, isintent_in,
-    isintent_out, islogicalfunction,ismoduleroutine, isscalar,
+    isintent_out, islogicalfunction, ismoduleroutine, isscalar,
     issubroutine, issubroutine_wrap, outmess, show
 )
 
 
-def var2fixfortran(vars,a,fa=None,f90mode=None):
+def var2fixfortran(vars, a, fa=None, f90mode=None):
     if fa is None:
         fa = a
     if a not in vars:
         show(vars)
-        outmess('var2fixfortran: No definition for argument "%s".\n'%a)
+        outmess('var2fixfortran: No definition for argument "%s".\n' % a)
         return ''
     if 'typespec' not in vars[a]:
         show(vars[a])
-        outmess('var2fixfortran: No typespec for argument "%s".\n'%a)
+        outmess('var2fixfortran: No typespec for argument "%s".\n' % a)
         return ''
-    vardef=vars[a]['typespec']
-    if vardef=='type' and 'typename' in vars[a]:
-        vardef='%s(%s)'%(vardef, vars[a]['typename'])
-    selector={}
+    vardef = vars[a]['typespec']
+    if vardef == 'type' and 'typename' in vars[a]:
+        vardef = '%s(%s)' % (vardef, vars[a]['typename'])
+    selector = {}
     lk = ''
     if 'kindselector' in vars[a]:
-        selector=vars[a]['kindselector']
+        selector = vars[a]['kindselector']
         lk = 'kind'
     elif 'charselector' in vars[a]:
-        selector=vars[a]['charselector']
+        selector = vars[a]['charselector']
         lk = 'len'
     if '*' in selector:
         if f90mode:
             if selector['*'] in ['*', ':', '(*)']:
-                vardef='%s(len=*)'%(vardef)
+                vardef = '%s(len=*)' % (vardef)
             else:
-                vardef='%s(%s=%s)'%(vardef, lk, selector['*'])
+                vardef = '%s(%s=%s)' % (vardef, lk, selector['*'])
         else:
             if selector['*'] in ['*', ':']:
-                vardef='%s*(%s)'%(vardef, selector['*'])
+                vardef = '%s*(%s)' % (vardef, selector['*'])
             else:
-                vardef='%s*%s'%(vardef, selector['*'])
+                vardef = '%s*%s' % (vardef, selector['*'])
     else:
         if 'len' in selector:
-            vardef='%s(len=%s'%(vardef, selector['len'])
+            vardef = '%s(len=%s' % (vardef, selector['len'])
             if 'kind' in selector:
-                vardef='%s,kind=%s)'%(vardef, selector['kind'])
+                vardef = '%s,kind=%s)' % (vardef, selector['kind'])
             else:
-                vardef='%s)'%(vardef)
+                vardef = '%s)' % (vardef)
         elif 'kind' in selector:
-            vardef='%s(kind=%s)'%(vardef, selector['kind'])
+            vardef = '%s(kind=%s)' % (vardef, selector['kind'])
 
-    vardef='%s %s'%(vardef, fa)
+    vardef = '%s %s' % (vardef, fa)
     if 'dimension' in vars[a]:
-        vardef='%s(%s)'%(vardef, ','.join(vars[a]['dimension']))
+        vardef = '%s(%s)' % (vardef, ','.join(vars[a]['dimension']))
     return vardef
 
-def createfuncwrapper(rout,signature=0):
+
+def createfuncwrapper(rout, signature=0):
     assert isfunction(rout)
 
     extra_args = []
@@ -84,7 +85,7 @@ def createfuncwrapper(rout,signature=0):
     for a in rout['args']:
         v = rout['vars'][a]
         for i, d in enumerate(v.get('dimension', [])):
-            if d==':':
+            if d == ':':
                 dn = 'f2py_%s_d%s' % (a, i)
                 dv = dict(typespec='integer', intent=['hide'])
                 dv['='] = 'shape(%s, %s)' % (a, i)
@@ -95,36 +96,40 @@ def createfuncwrapper(rout,signature=0):
     need_interface = bool(extra_args)
 
     ret = ['']
-    def add(line,ret=ret):
-        ret[0] = '%s\n      %s'%(ret[0], line)
+
+    def add(line, ret=ret):
+        ret[0] = '%s\n      %s' % (ret[0], line)
     name = rout['name']
     fortranname = getfortranname(rout)
     f90mode = ismoduleroutine(rout)
-    newname = '%sf2pywrap'%(name)
+    newname = '%sf2pywrap' % (name)
 
     if newname not in vars:
         vars[newname] = vars[name]
-        args = [newname]+rout['args'][1:]
+        args = [newname] + rout['args'][1:]
     else:
-        args = [newname]+rout['args']
+        args = [newname] + rout['args']
 
     l = var2fixfortran(vars, name, newname, f90mode)
-    if l[:13]=='character*(*)':
-        if f90mode: l = 'character(len=10)'+l[13:]
-        else: l = 'character*10'+l[13:]
+    if l[:13] == 'character*(*)':
+        if f90mode:
+            l = 'character(len=10)' + l[13:]
+        else:
+            l = 'character*10' + l[13:]
         charselect = vars[name]['charselector']
-        if charselect.get('*', '')=='(*)':
+        if charselect.get('*', '') == '(*)':
             charselect['*'] = '10'
     sargs = ', '.join(args)
     if f90mode:
-        add('subroutine f2pywrap_%s_%s (%s)'%(rout['modulename'], name, sargs))
+        add('subroutine f2pywrap_%s_%s (%s)' %
+            (rout['modulename'], name, sargs))
         if not signature:
-            add('use %s, only : %s'%(rout['modulename'], fortranname))
+            add('use %s, only : %s' % (rout['modulename'], fortranname))
     else:
-        add('subroutine f2pywrap%s (%s)'%(name, sargs))
+        add('subroutine f2pywrap%s (%s)' % (name, sargs))
         if not need_interface:
-            add('external %s'%(fortranname))
-            l = l + ', '+fortranname
+            add('external %s' % (fortranname))
+            l = l + ', ' + fortranname
     if need_interface:
         for line in rout['saved_interface'].split('\n'):
             if line.lstrip().startswith('use '):
@@ -134,20 +139,23 @@ def createfuncwrapper(rout,signature=0):
     dumped_args = []
     for a in args:
         if isexternal(vars[a]):
-            add('external %s'%(a))
+            add('external %s' % (a))
             dumped_args.append(a)
     for a in args:
-        if a in dumped_args: continue
+        if a in dumped_args:
+            continue
         if isscalar(vars[a]):
             add(var2fixfortran(vars, a, f90mode=f90mode))
             dumped_args.append(a)
     for a in args:
-        if a in dumped_args: continue
+        if a in dumped_args:
+            continue
         if isintent_in(vars[a]):
             add(var2fixfortran(vars, a, f90mode=f90mode))
             dumped_args.append(a)
     for a in args:
-        if a in dumped_args: continue
+        if a in dumped_args:
+            continue
         add(var2fixfortran(vars, a, f90mode=f90mode))
 
     add(l)
@@ -165,19 +173,20 @@ def createfuncwrapper(rout,signature=0):
 
     if not signature:
         if islogicalfunction(rout):
-            add('%s = .not.(.not.%s(%s))'%(newname, fortranname, sargs))
+            add('%s = .not.(.not.%s(%s))' % (newname, fortranname, sargs))
         else:
-            add('%s = %s(%s)'%(newname, fortranname, sargs))
+            add('%s = %s(%s)' % (newname, fortranname, sargs))
     if f90mode:
-        add('end subroutine f2pywrap_%s_%s'%(rout['modulename'], name))
+        add('end subroutine f2pywrap_%s_%s' % (rout['modulename'], name))
     else:
         add('end')
-    #print '**'*10
-    #print ret[0]
-    #print '**'*10
+    # print '**'*10
+    # print ret[0]
+    # print '**'*10
     return ret[0]
 
-def createsubrwrapper(rout,signature=0):
+
+def createsubrwrapper(rout, signature=0):
     assert issubroutine(rout)
 
     extra_args = []
@@ -185,7 +194,7 @@ def createsubrwrapper(rout,signature=0):
     for a in rout['args']:
         v = rout['vars'][a]
         for i, d in enumerate(v.get('dimension', [])):
-            if d==':':
+            if d == ':':
                 dn = 'f2py_%s_d%s' % (a, i)
                 dv = dict(typespec='integer', intent=['hide'])
                 dv['='] = 'shape(%s, %s)' % (a, i)
@@ -196,8 +205,9 @@ def createsubrwrapper(rout,signature=0):
     need_interface = bool(extra_args)
 
     ret = ['']
-    def add(line,ret=ret):
-        ret[0] = '%s\n      %s'%(ret[0], line)
+
+    def add(line, ret=ret):
+        ret[0] = '%s\n      %s' % (ret[0], line)
     name = rout['name']
     fortranname = getfortranname(rout)
     f90mode = ismoduleroutine(rout)
@@ -206,13 +216,14 @@ def createsubrwrapper(rout,signature=0):
 
     sargs = ', '.join(args)
     if f90mode:
-        add('subroutine f2pywrap_%s_%s (%s)'%(rout['modulename'], name, sargs))
+        add('subroutine f2pywrap_%s_%s (%s)' %
+            (rout['modulename'], name, sargs))
         if not signature:
-            add('use %s, only : %s'%(rout['modulename'], fortranname))
+            add('use %s, only : %s' % (rout['modulename'], fortranname))
     else:
-        add('subroutine f2pywrap%s (%s)'%(name, sargs))
+        add('subroutine f2pywrap%s (%s)' % (name, sargs))
         if not need_interface:
-            add('external %s'%(fortranname))
+            add('external %s' % (fortranname))
 
     if need_interface:
         for line in rout['saved_interface'].split('\n'):
@@ -222,15 +233,17 @@ def createsubrwrapper(rout,signature=0):
     dumped_args = []
     for a in args:
         if isexternal(vars[a]):
-            add('external %s'%(a))
+            add('external %s' % (a))
             dumped_args.append(a)
     for a in args:
-        if a in dumped_args: continue
+        if a in dumped_args:
+            continue
         if isscalar(vars[a]):
             add(var2fixfortran(vars, a, f90mode=f90mode))
             dumped_args.append(a)
     for a in args:
-        if a in dumped_args: continue
+        if a in dumped_args:
+            continue
         add(var2fixfortran(vars, a, f90mode=f90mode))
 
     if need_interface:
@@ -245,14 +258,14 @@ def createsubrwrapper(rout,signature=0):
     sargs = ', '.join([a for a in args if a not in extra_args])
 
     if not signature:
-        add('call %s(%s)'%(fortranname, sargs))
+        add('call %s(%s)' % (fortranname, sargs))
     if f90mode:
-        add('end subroutine f2pywrap_%s_%s'%(rout['modulename'], name))
+        add('end subroutine f2pywrap_%s_%s' % (rout['modulename'], name))
     else:
         add('end')
-    #print '**'*10
-    #print ret[0]
-    #print '**'*10
+    # print '**'*10
+    # print ret[0]
+    # print '**'*10
     return ret[0]
 
 
@@ -260,19 +273,20 @@ def assubr(rout):
     if isfunction_wrap(rout):
         fortranname = getfortranname(rout)
         name = rout['name']
-        outmess('\t\tCreating wrapper for Fortran function "%s"("%s")...\n'%(name, fortranname))
+        outmess('\t\tCreating wrapper for Fortran function "%s"("%s")...\n' % (
+            name, fortranname))
         rout = copy.copy(rout)
         fname = name
         rname = fname
         if 'result' in rout:
             rname = rout['result']
-            rout['vars'][fname]=rout['vars'][rname]
+            rout['vars'][fname] = rout['vars'][rname]
         fvar = rout['vars'][fname]
         if not isintent_out(fvar):
             if 'intent' not in fvar:
-                fvar['intent']=[]
+                fvar['intent'] = []
             fvar['intent'].append('out')
-            flag=1
+            flag = 1
             for i in fvar['intent']:
                 if i.startswith('out='):
                     flag = 0
@@ -284,7 +298,8 @@ def assubr(rout):
     if issubroutine_wrap(rout):
         fortranname = getfortranname(rout)
         name = rout['name']
-        outmess('\t\tCreating wrapper for Fortran subroutine "%s"("%s")...\n'%(name, fortranname))
+        outmess('\t\tCreating wrapper for Fortran subroutine "%s"("%s")...\n' % (
+            name, fortranname))
         rout = copy.copy(rout)
         return rout, createsubrwrapper(rout)
     return rout, ''