Merge pull request debops#4 from ypid/fixes/coding-style

Fixed PEP8 coding style issues.
ypid · Jun 5, 2016 · c9767eb · c9767eb
2 parents 84f9825 + 66d2f25
commit c9767eb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/bin/yaml2rst b/bin/yaml2rst
@@ -31,6 +31,7 @@ import yaml2rst
 import argparse
 import sys
 
+
 def main(infilename, outfilename):
     if infilename == '-':
         infh = sys.stdin
@@ -51,4 +52,3 @@ parser.add_argument('outfilename', metavar='outfile',
                     help="rst-file to write (`-` for stdout)")
 args = parser.parse_args()
 main(**vars(args))
-
diff --git a/yaml2rst.py b/yaml2rst.py
@@ -44,17 +44,18 @@ def __init__(self, **keywordargs):
 
     enum = Struct()
     enum.formatinfo = {
-          'parens': Struct(prefix='(', suffix=')', start=1, end=-1),
-          'rparen': Struct(prefix='', suffix=')', start=0, end=-1),
-          'period': Struct(prefix='', suffix='.', start=0, end=-1)}
+        'parens': Struct(prefix='(', suffix=')', start=1, end=-1),
+        'rparen': Struct(prefix='', suffix=')', start=0, end=-1),
+        'period': Struct(prefix='', suffix='.', start=0, end=-1)}
     enum.formats = enum.formatinfo.keys()
     enum.sequences = ['arabic', 'loweralpha', 'upperalpha',
-                      'lowerroman', 'upperroman'] # ORDERED!
+                      'lowerroman', 'upperroman']  # ORDERED!
     enum.sequencepats = {'arabic': '[0-9]+',
                          'loweralpha': '[a-z]',
                          'upperalpha': '[A-Z]',
                          'lowerroman': '[ivxlcdm]+',
-                         'upperroman': '[IVXLCDM]+',}
+                         'upperroman': '[IVXLCDM]+',
+                         }
 
     pats = {}
     pats['nonalphanum7bit'] = '[!-/:-@[-`{-~]'
@@ -70,21 +71,23 @@ def __init__(self, **keywordargs):
               pats['enum'], re.escape(enum.formatinfo[format].suffix))
 
     patterns = {
-          'bullet': u'[-+*\u2022\u2023\u2043]( +|$)',
-          'enumerator': r'(%(parens)s|%(rparen)s|%(period)s)( +|$)' % pats,
-          }
+        'bullet': u'[-+*\u2022\u2023\u2043]( +|$)',
+        'enumerator': r'(%(parens)s|%(rparen)s|%(period)s)( +|$)' % pats,
+    }
     for name, pat in patterns.items():
         patterns[name] = re.compile(pat)
     return patterns
 
 
 PATTERNS = setup_patterns()
 
+
 def get_indent(line):
     stripped_line = line.lstrip()
     indent = len(line) - len(stripped_line)
     if (PATTERNS['bullet'].match(stripped_line) or
-        PATTERNS['enumerator'].match(stripped_line)):
+            PATTERNS['enumerator'].match(stripped_line)):
+
         indent += len(stripped_line.split(None, 1)[0])+1
     return indent
 
@@ -103,7 +106,7 @@ def convert(lines):
                 yield ''
             line = last_text_line = line[2:]
             yield line
-            last_indent = get_indent(line)* ' '
+            last_indent = get_indent(line) * ' '
             state = STATE_TEXT
         elif line == '---':
             pass
@@ -117,9 +120,10 @@ def convert(lines):
             yield last_indent + '  ' + line
             state = STATE_YAML
 
+
 def convert_text(yaml_text):
     return '\n'.join(convert(yaml_text.splitlines()))
-    
+
 
 def convert_file(infilename, outfilename):
     with open(infilename) as infh: