even more style fixes

Author: pseewald

__init__.py

@@ -1,15 +1,15 @@
+"""
+  This is a collection of Fortran parsing utilities.
+"""
 import re
-import string
 from collections import deque
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
 
 USE_PARSE_RE = re.compile(
     r" *use +(?P<module>[a-zA-Z_][a-zA-Z_0-9]*)(?P<only> *, *only *:)? *(?P<imports>.*)$",
     flags=re.IGNORECASE)
-VAR_DECL_RE = re.compile(r" *(?P<type>integer(?: *\* *[0-9]+)?|logical|character(?: *\* *[0-9]+)?|real(?: *\* *[0-9]+)?|complex(?: *\* *[0-9]+)?|type) *(?P<parameters>\((?:[^()]+|\((?:[^()]+|\([^()]*\))*\))*\))? *(?P<attributes>(?: *, *[a-zA-Z_0-9]+(?: *\((?:[^()]+|\((?:[^()]+|\([^()]*\))*\))*\))?)+)? *(?P<dpnt>::)?(?P<vars>[^\n]+)\n?", re.IGNORECASE)  # $
+
+# FIXME bad ass regex!
+VAR_DECL_RE = re.compile(r" *(?P<type>integer(?: *\* *[0-9]+)?|logical|character(?: *\* *[0-9]+)?|real(?: *\* *[0-9]+)?|complex(?: *\* *[0-9]+)?|type) *(?P<parameters>\((?:[^()]+|\((?:[^()]+|\([^()]*\))*\))*\))? *(?P<attributes>(?: *, *[a-zA-Z_0-9]+(?: *\((?:[^()]+|\((?:[^()]+|\([^()]*\))*\))*\))?)+)? *(?P<dpnt>::)?(?P<vars>[^\n]+)\n?", re.IGNORECASE)
 
 OMP_DIR_RE = re.compile(r"^\s*(!\$omp)", re.IGNORECASE)
 OMP_RE = re.compile(r"^\s*(!\$)", re.IGNORECASE)
@@ -75,16 +75,16 @@ def __init__(self, infile):
         self.infile = infile
         self.line_nr = 0
 
-    def nextFortranLine(self):
+    def next_fortran_line(self):
         """Reads a group of connected lines (connected with &, separated by newline or semicolon)
         returns a touple with the joined line, and a list with the original lines.
         Doesn't support multiline character constants!
         """
-        lineRe = re.compile(
-            # $
+        # FIXME regex
+        line_re = re.compile(
             r"(?:(?P<preprocessor>#.*\n?)| *(&)?(?P<core>(?:!\$|[^&!\"']+|\"[^\"]*\"|'[^']*')*)(?P<continue>&)? *(?P<comment>!.*)?\n?)",
             re.IGNORECASE)
-        joinedLine = ""
+        joined_line = ""
         comments = []
         lines = []
         continuation = 0
@@ -109,7 +109,7 @@ def nextFortranLine(self):
                         omp_indent = 0
                         is_omp_conditional = False
                         line_start = pos + 1
-                if(line_start < len(line)):
+                if line_start < len(line):
                     # line + comment
                     self.line_buffer.append('!$' * is_omp_conditional +
                                             line[line_start:])
@@ -121,35 +121,35 @@ def nextFortranLine(self):
                 break
 
             lines.append(line)
-            m = lineRe.match(line)
-            if not m or m.span()[1] != len(line):
+            match = line_re.match(line)
+            if not match or match.span()[1] != len(line):
                 # FIXME: does not handle line continuation of
                 # omp conditional fortran statements
                 # starting with an ampersand.
                 raise SyntaxError("unexpected line format:" + repr(line))
-            if m.group("preprocessor"):
+            if match.group("preprocessor"):
                 if len(lines) > 1:
                     raise SyntaxError(
                         "continuation to a preprocessor line not supported " + repr(line))
                 comments.append(line)
                 break
-            coreAtt = m.group("core")
-            if OMP_RE.match(coreAtt) and joinedLine.strip():
+            core_att = match.group("core")
+            if OMP_RE.match(core_att) and joined_line.strip():
                 # remove omp '!$' for line continuation
-                coreAtt = OMP_RE.sub('', coreAtt, count=1).lstrip()
-            joinedLine = joinedLine.rstrip("\n") + coreAtt
-            if coreAtt and not coreAtt.isspace():
+                core_att = OMP_RE.sub('', core_att, count=1).lstrip()
+            joined_line = joined_line.rstrip("\n") + core_att
+            if core_att and not core_att.isspace():
                 continuation = 0
-            if m.group("continue"):
+            if match.group("continue"):
                 continuation = 1
             if line.lstrip().startswith('!') and not OMP_RE.search(line):
                 comments.append(line.rstrip('\n'))
-            elif m.group("comment"):
-                comments.append(m.group("comment"))
+            elif match.group("comment"):
+                comments.append(match.group("comment"))
             else:
                 comments.append('')
             if not continuation:
                 break
-        return (joinedLine, comments, lines)
+        return (joined_line, comments, lines)
 
 

fparse_utils.py

@@ -42,13 +42,12 @@
 import sys
 import os
 import tempfile
+import logging
 from fparse_utils import (USE_PARSE_RE, VAR_DECL_RE, InputStream,
                           CharFilter, OMP_RE, OMP_DIR_RE)
-import logging
 
 
 # PY2/PY3 compat wrappers:
-
 try:
     any
 except NameError:
@@ -162,6 +161,7 @@ def any(iterable):
 
 class FortranSyntaxError(Exception):
     """Exception for unparseable Fortran code"""
+
     def __init__(self, filename, line_nr,
                  msg=("Syntax error - "
                       "this formatter can not handle invalid Fortran files.")):
@@ -450,7 +450,7 @@ def inspect_ffile_format(infile, indent_size):
     prev_offset = 0
     first_indent = -1
     while 1:
-        f_line, _, lines = stream.nextFortranLine()
+        f_line, _, lines = stream.next_fortran_line()
         if not lines:
             break
 
@@ -515,7 +515,7 @@ def format_single_fline(f_line, whitespace, linebreak_pos, ampersand_sep,
                 line_ftd = line_ftd + char
         else:
             if (line_ftd and line_ftd[-1] == ' ' and
-               (not re.search(r'[\w"]', char) and not is_decl)):
+                    (not re.search(r'[\w"]', char) and not is_decl)):
                 line_ftd = line_ftd[:-1]  # remove spaces except between words
             line_ftd = line_ftd + line[pos_prev + 1:pos + 1]
         pos_prev = pos
@@ -710,6 +710,9 @@ def format_single_fline(f_line, whitespace, linebreak_pos, ampersand_sep,
 
 
 def reformat_inplace(filename, stdout=False, **kwargs):
+    """
+    reformat a file in place.
+    """
     if filename == 'stdin':
         infile = tempfile.TemporaryFile(mode='r+')
         infile.write(sys.stdin.read())
@@ -765,7 +768,7 @@ def reformat_ffile(infile, outfile, indent_size=3, whitespace=2,
     in_manual_block = False
 
     while 1:
-        f_line, comments, lines = stream.nextFortranLine()
+        f_line, comments, lines = stream.next_fortran_line()
         if not lines:
             break
 
@@ -861,9 +864,9 @@ def reformat_ffile(infile, outfile, indent_size=3, whitespace=2,
             pre_ampersand = []
             ampersand_sep = []
             for pos, line in enumerate(lines):
-                m = re.search(SOL_STR + r'(&\s*)', line)
-                if m:
-                    pre_ampersand.append(m.group(1))
+                match = re.search(SOL_STR + r'(&\s*)', line)
+                if match:
+                    pre_ampersand.append(match.group(1))
                     sep = len(re.search(r'(\s*)&[\s]*(?:!.*)?$',
                                         lines[pos - 1]).group(1))
                     ampersand_sep.append(sep)
@@ -972,11 +975,11 @@ def reformat_ffile(infile, outfile, indent_size=3, whitespace=2,
 def main(argv=None):
     if argv is None:
         argv = sys.argv
-    defaultsDict = {'indent': 3, 'whitespace': 2,
-                    'stdout': 0, 'report-errors': 1,
-                    'debug': 0}
+    defaults_dict = {'indent': 3, 'whitespace': 2,
+                     'stdout': 0, 'report-errors': 1,
+                     'debug': 0}
 
-    usageDesc = ("usage:\n" + argv[0] + """
+    usage_desc = ("usage:\n" + argv[0] + """
     [--indent=3] [--whitespace=2]
     [--[no-]stdout] [--[no-]report-errors] file1 [file2 ...]
     [--help]
@@ -1006,22 +1009,22 @@ def main(argv=None):
              report warnings and errors
 
     Defaults:
-    """ + str(defaultsDict))
+    """ + str(defaults_dict))
 
     if "--help" in argv:
-        sys.stderr.write(usageDesc + '\n')
+        sys.stderr.write(usage_desc + '\n')
         return 0
     args = []
     for arg in argv[1:]:
-        m = re.match(
+        match = re.match(
             r"--(no-)?(stdout|report-errors|debug)", arg)
-        if m:
-            defaultsDict[m.groups()[1]] = not m.groups()[0]
+        if match:
+            defaults_dict[match.groups()[1]] = not match.groups()[0]
         else:
-            m = re.match(
+            match = re.match(
                 r"--(indent|whitespace)=(.*)", arg)
-            if m:
-                defaultsDict[m.groups()[0]] = int(m.groups()[1])
+            if match:
+                defaults_dict[match.groups()[0]] = int(match.groups()[1])
             else:
                 if arg.startswith('--'):
                     sys.stderr.write('unknown option ' + arg + '\n')
@@ -1035,10 +1038,10 @@ def main(argv=None):
         if not os.path.isfile(filename) and filename != 'stdin':
             sys.stderr.write("file " + filename + " does not exists!\n")
         else:
-            stdout = defaultsDict['stdout'] or filename == 'stdin'
+            stdout = defaults_dict['stdout'] or filename == 'stdin'
 
-            if defaultsDict['report-errors']:
-                if defaultsDict['debug']:
+            if defaults_dict['report-errors']:
+                if defaults_dict['debug']:
                     level = logging.DEBUG
                 else:
                     level = logging.INFO
@@ -1048,17 +1051,17 @@ def main(argv=None):
 
             logger = logging.getLogger('prettify-logger')
             logger.setLevel(level)
-            sh = logging.StreamHandler()
-            sh.setLevel(level)
+            stream_handler = logging.StreamHandler()
+            stream_handler.setLevel(level)
             formatter = logging.Formatter('%(levelname)s - %(message)s')
-            sh.setFormatter(formatter)
-            logger.addHandler(sh)
+            stream_handler.setFormatter(formatter)
+            logger.addHandler(stream_handler)
 
             try:
                 reformat_inplace(filename,
                                  stdout=stdout,
-                                 indent_size=defaultsDict['indent'],
-                                 whitespace=defaultsDict['whitespace'])
+                                 indent_size=defaults_dict['indent'],
+                                 whitespace=defaults_dict['whitespace'])
             except:
                 failure += 1
                 import traceback

fprettify.py

@@ -1,4 +1,3 @@
-
 import sys
 import unittest