fix code style

Author: dirk-thomas

docutils_readers_rep.py

@@ -2,15 +2,13 @@
 # Author: David Goodger <[email protected]>
 # Copyright: This module has been placed in the public domain.
 
-"""
-Python Enhancement Proposal (REP) Reader.
-"""
+"""Python Enhancement Proposal (REP) Reader."""
 
 __docformat__ = 'reStructuredText'
 
 
 from docutils.readers import standalone
-from docutils.transforms import references, misc, frontmatter
+from docutils.transforms import frontmatter
 import docutils_transforms_reps as reps
 from docutils.parsers import rst
 

docutils_transforms_reps.py

@@ -13,29 +13,27 @@
 
 __docformat__ = 'reStructuredText'
 
-import sys
 import os
 import re
 import time
 from docutils import nodes, utils, languages
-from docutils import ApplicationError, DataError
-from docutils.transforms import Transform, TransformError
+from docutils import DataError
+from docutils.transforms import Transform
 from docutils.transforms import parts, references, misc
 
 
 class Headers(Transform):
 
-    """
-    Process fields in a REP's initial RFC-2822 header.
-    """
+    """Process fields in a REP's initial RFC-2822 header."""
 
     default_priority = 360
 
     rep_url = 'rep-%04d'
-    rep_git_url = 'https://github.com/ros-infrastructure/rep/blob/master/rep-%04d.rst'
+    rep_git_url = \
+        'https://github.com/ros-infrastructure/rep/blob/master/rep-%04d.rst'
     rcs_keyword_substitutions = (
-          (re.compile(r'\$' r'RCSfile: (.+),v \$$', re.IGNORECASE), r'\1'),
-          (re.compile(r'\$[a-zA-Z]+: (.+) \$$'), r'\1'),)
+        (re.compile(r'\$' r'RCSfile: (.+),v \$$', re.IGNORECASE), r'\1'),
+        (re.compile(r'\$[a-zA-Z]+: (.+) \$$'), r'\1'),)
 
     def apply(self):
         self.document.settings.rep_base_url = 'http://ros.org/reps/'
@@ -45,12 +43,12 @@ def apply(self):
             raise DataError('Document tree is empty.')
         header = self.document[0]
         if not isinstance(header, nodes.field_list) or \
-              'rfc2822' not in header['classes']:
+                'rfc2822' not in header['classes']:
             raise DataError('Document does not begin with an RFC-2822 '
                             'header; it is not a REP.')
         rep = None
         for field in header:
-            if field[0].astext().lower() == 'rep': # should be the first field
+            if field[0].astext().lower() == 'rep':  # should be the first field
                 value = field[1].astext()
                 try:
                     rep = int(value)
@@ -94,8 +92,8 @@ def apply(self):
                                     % field.pformat(level=1))
             elif name == 'last-modified':
                 date = time.strftime(
-                      '%d-%b-%Y',
-                      time.localtime(os.stat(self.document['source'])[8]))
+                    '%d-%b-%Y',
+                    time.localtime(os.stat(self.document['source'])[8]))
                 if repo_url:
                     body += nodes.paragraph(
                         '', '', nodes.reference('', date, refuri=repo_url))
@@ -121,7 +119,7 @@ def apply(self):
                         refuri=(self.document.settings.rep_base_url
                                 + self.rep_url % repno)))
                     newbody.append(space)
-                para[:] = newbody[:-1] # drop trailing space
+                para[:] = newbody[:-1]  # drop trailing space
             elif name == 'last-modified':
                 utils.clean_rcs_keywords(para, self.rcs_keyword_substitutions)
                 if repo_url:
@@ -147,9 +145,11 @@ class Contents(Transform):
     def apply(self):
         try:
             #incompatible API change in docutils
-            language = languages.get_language(self.document.settings.language_code, None)
+            language = languages.get_language(
+                self.document.settings.language_code, None)
         except TypeError:
-            language = languages.get_language(self.document.settings.language_code )
+            language = languages.get_language(
+                self.document.settings.language_code)
         name = language.labels['contents']
         title = nodes.title('', name)
         topic = nodes.topic('', title, classes=['contents'])
@@ -215,11 +215,9 @@ def cleanup_callback(self, pending):
 
 class REPZero(Transform):
 
-    """
-    Special processing for REP 0.
-    """
+    """Special processing for REP 0."""
 
-    default_priority =760
+    default_priority = 760
 
     def apply(self):
         visitor = REPZeroSpecial(self.document)
@@ -264,7 +262,7 @@ def visit_row(self, node):
 
     def visit_entry(self, node):
         self.document.settings.rep_base_url = 'http://ros.org/reps/'
-        
+
         self.entry += 1
         if self.rep_table and self.entry == 2 and len(node) == 1:
             node['classes'].append('num')
@@ -284,6 +282,7 @@ def visit_entry(self, node):
                         '[email protected]',
                         '[email protected]')
 
+
 def mask_email(ref, repno=None):
     """
     Mask the email address in `ref` and return a replacement node.

genrepindex.py

@@ -14,7 +14,9 @@
     3. Output the REP (both by category and numerical index).
 
 """
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import with_statement
 
 import sys
 import os
@@ -38,13 +40,16 @@ def main(argv):
             abs_file_path = os.path.join(path, file_path)
             if not os.path.isfile(abs_file_path):
                 continue
-            if file_path.startswith("rep-") and file_path.endswith(".rst") and not file_path == 'rep-0000.rst':
-                with codecs.open(abs_file_path, 'r', encoding='UTF-8') as rep_file:
+            if file_path.startswith("rep-") and \
+                    file_path.endswith(".rst") and \
+                    not file_path == 'rep-0000.rst':
+                with codecs.open(
+                        abs_file_path, 'r', encoding='UTF-8') as rep_file:
                     try:
                         rep = REP(rep_file)
                         if rep.number != int(file_path[4:-4]):
-                            raise REPError('REP number does not match file name',
-                                           file_path, rep.number)
+                            raise REPError('REP number does not match file ' +
+                                           'name', file_path, rep.number)
                         reps.append(rep)
                     except REPError as e:
                         errmsg = "Error processing REP %s (%s), excluding:" % \

rep0/output.py

@@ -14,10 +14,11 @@
 
 indent = u' '
 
+
 def write_column_headers(output):
     """Output the column headers for the REP indices."""
     column_headers = {'status': u'', 'type': u'', 'number': u'num',
-                        'title': u'title', 'authors': u'owner'}
+                      'title': u'title', 'authors': u'owner'}
     print(constants.column_format % column_headers, file=output)
     underline_headers = {}
     for key, value in column_headers.items():
@@ -26,8 +27,12 @@ def write_column_headers(output):
 
 
 def sort_reps(reps):
-    """Sort REPs into meta, informational, accepted, open, finished,
-    and essentially dead."""
+    """
+    Sort REPs into categories.
+
+    Current these categories include: meta, informational, accepted, open,
+    finished, and essentially dead.
+    """
     meta = []
     info = []
     accepted = []
@@ -41,8 +46,8 @@ def sort_reps(reps):
             meta.append(rep)
         elif rep.status == 'Draft':
             open_.append(rep)
-        elif rep.status in ('Rejected', 'Withdrawn', 'Deferred',
-                'Incomplete', 'Replaced'):
+        elif rep.status in [
+                'Rejected', 'Withdrawn', 'Deferred', 'Incomplete', 'Replaced']:
             dead.append(rep)
         elif rep.type_ == 'Informational':
             info.append(rep)
@@ -99,6 +104,7 @@ def sort_authors(authors_dict):
     authors_list.sort(key=attrgetter('sort_by'))
     return authors_list
 
+
 def normalized_last_first(name):
     return len(unicodedata.normalize('NFC', name.last_first))
 
@@ -125,7 +131,8 @@ def write_rep0(reps, output=sys.stdout):
     for rep in info:
         print(u'%s' % rep, file=output)
     print('', file=output)
-    print(u" Accepted REPs (accepted; may not be implemented yet)", file=output)
+    print(u" Accepted REPs (accepted; may not be implemented yet)",
+          file=output)
     print('', file=output)
     for rep in accepted:
         print(u'%s' % rep, file=output)
@@ -135,7 +142,8 @@ def write_rep0(reps, output=sys.stdout):
     for rep in open_:
         print(u'%s' % rep, file=output)
     print('', file=output)
-    print(u" Finished REPs (done, implemented in code repository)", file=output)
+    print(u" Finished REPs (done, implemented in code repository)",
+          file=output)
     print('', file=output)
     for rep in finished:
         print(u'%s' % rep, file=output)
@@ -172,15 +180,18 @@ def write_rep0(reps, output=sys.stdout):
     authors_dict = verify_email_addresses(reps)
     max_name = max(list(authors_dict.keys()), key=normalized_last_first)
     max_name_len = len(max_name.last_first)
-    print(u"    %s  %s" % ('name'.ljust(max_name_len), 'email address'), file=output)
-    print(u"    %s  %s" % ((len('name')*'-').ljust(max_name_len),
-                                    len('email address')*'-'), file=output)
+    print(u"    %s  %s" % ('name'.ljust(max_name_len), 'email address'),
+          file=output)
+    print(u"    %s  %s" %
+          ((len('name')*'-').ljust(max_name_len), len('email address')*'-'),
+          file=output)
     sorted_authors = sort_authors(authors_dict)
     for author in sorted_authors:
         # Use the email from authors_dict instead of the one from 'author' as
         # the author instance may have an empty email.
-        print((u"    %s  %s" %
-                (author.last_first.ljust(max_name_len), authors_dict[author])), file=output)
+        print(u"    %s  %s" %
+              (author.last_first.ljust(max_name_len), authors_dict[author]),
+              file=output)
     print('', file=output)
     print('', file=output)
     print(u"References", file=output)

rep0/rep.py

@@ -89,8 +89,8 @@ def sort_by(self):
             if part[0].isupper():
                 break
         else:
-            raise ValueError("last name missing a capital letter: %r"
-	                                                       % name_parts)
+            raise ValueError(
+                "last name missing a capital letter: %r" % name_parts)
         base = u' '.join(name_parts[index:]).lower()
         return unicodedata.normalize('NFKD', base).encode('ASCII', 'ignore')
 
@@ -121,7 +121,7 @@ def _last_name(self, full_name):
 class REP(object):
 
     """Representation of REPs.
-    
+
     Attributes:
 
         + number : int
@@ -177,8 +177,7 @@ def __init__(self, rep_file):
                                    (header_name, current_header),
                                    rep_file.name)
         except StopIteration:
-            raise REPError("headers missing or out of order",
-                                rep_file.name)
+            raise REPError("headers missing or out of order", rep_file.name)
         required = False
         try:
             while not required:
@@ -232,9 +231,9 @@ def _parse_author(self, data):
             # Watch out for commas separating multiple names.
             regex += u'(,\s*)?'
             for match in re.finditer(regex, data):
-                # Watch out for suffixes like 'Jr.' when they are comma-separated
-                # from the name and thus cause issues when *all* names are only
-                # separated by commas.
+                # Watch out for suffixes like 'Jr.' when they are
+                # comma-separated from the name and thus cause issues when
+                # *all* names are only separated by commas.
                 match_dict = match.groupdict()
                 author = match_dict['author']
                 if not author.partition(' ')[1] and author.endswith('.'):
@@ -280,9 +279,10 @@ def title_abbr(self):
 
     def __str__(self):
         """Return the line entry for the REP."""
-        rep_info = {'type': self.type_abbr, 'number': str(self.number),
-                'title': self.title_abbr, 'status': self.status_abbr,
-                'authors': self.author_abbr}
+        rep_info = {
+            'type': self.type_abbr, 'number': str(self.number),
+            'title': self.title_abbr, 'status': self.status_abbr,
+            'authors': self.author_abbr}
         return constants.column_format % rep_info
 
     def __unicode__(self):