PEP8-ify several files

converters/base.py

@@ -18,9 +18,11 b' from IPython.nbformat import current as nbformat'
 # Class declarations
 #-----------------------------------------------------------------------------
 
+
 class ConversionException(Exception):
     pass
 
+
 class DocStringInheritor(type):
     """
     This metaclass will walk the list of bases until the desired
@@ -50,6 +52,7 b' class DocStringInheritor(type):'
             newClassDict[attributeName] = attribute
         return type.__new__(meta, classname, bases, newClassDict)
 
+
 class Converter(object):
     __metaclass__ = DocStringInheritor
     default_encoding = 'utf-8'
@@ -85,9 +88,12 b' class Converter(object):'
         return getattr(self, 'render_' + cell_type, self.render_unknown)
 
     def dispatch_display_format(self, format):
-        """return output_type dependent render method,  for example render_output_text
         """
-        return getattr(self, 'render_display_format_' + format, self.render_unknown_display)
+        return output_type dependent render method,  for example
+        render_output_text
+        """
+        return getattr(self, 'render_display_format_' + format,
+                       self.render_unknown_display)
 
     def convert(self, cell_separator='\n'):
         """
@@ -178,7 +184,8 b' class Converter(object):'
             data = data.decode('base64')
             fopen = lambda fname: open(fname, 'wb')
         else:
-            fopen = lambda fname: codecs.open(fname, 'wb', self.default_encoding)
+            fopen = lambda fname: codecs.open(fname, 'wb',
+                                              self.default_encoding)
 
         with fopen(fullname) as f:
             f.write(data)
@@ -267,7 +274,6 b' class Converter(object):'
         Returns list."""
         raise NotImplementedError
 
-
     def render_pyerr(self, output):
         """convert pyerr part of a code cell
 
@@ -320,4 +326,3 b' class Converter(object):'
         Returns list.
         """
         raise NotImplementedError
-

converters/bloggerhtml.py

@@ -1,6 +1,7 b''
 from converters.html import ConverterHTML 
 import io
 
+
 class ConverterBloggerHTML(ConverterHTML):
     """Convert a notebook to html suitable for easy pasting into Blogger.
 
@@ -18,4 +19,3 b' class ConverterBloggerHTML(ConverterHTML):'
 
     def optional_footer(self):
         return []
-

converters/rst.py

@@ -2,6 +2,7 b' from converters.base import Converter'
 from converters.utils import markdown2rst, rst_directive, remove_ansi
 from IPython.utils.text import indent
 
+
 class ConverterRST(Converter):
     extension = 'rst'
     heading_level = {1: '=', 2: '-', 3: '`', 4: '\'', 5: '.', 6: '~'}
@@ -67,7 +68,5 b' class ConverterRST(Converter):'
     def render_display_format_json(self, output):
         return rst_directive('.. raw:: json', output.json)
 
-
     def render_display_format_javascript(self, output):
         return rst_directive('.. raw:: javascript', output.javascript)
-

converters/utils.py

@@ -12,11 +12,13 b' from IPython.utils.text import indent'
 from IPython.utils import path, py3compat
 from IPython.nbformat.v3.nbjson import BytesEncoder
 
+
 #-----------------------------------------------------------------------------
 # Utility functions
 #-----------------------------------------------------------------------------
 def highlight(src, lang='ipython'):
-    """Return a syntax-highlighted version of the input source.
+    """
+    Return a syntax-highlighted version of the input source.
     """
     from pygments import highlight
     from pygments.lexers import get_lexer_by_name
@@ -29,6 +31,7 b" def highlight(src, lang='ipython'):"
         
     return highlight(src, lexer, HtmlFormatter())
 
+
 def output_container(f):
     """add a prompt-area next to an output"""
     def wrapped(self, output):
@@ -53,6 +56,7 b' def output_container(f):'
     
     return wrapped
 
+
 def text_cell(f):
     """wrap text cells in appropriate divs"""
     def wrapped(self, cell):
@@ -133,7 +137,9 b' def ansi2html(txt):'
     while m:
         cmds = m.groups()[0].split(';')
         closer = '</span>' if opened else ''
-        opened = len(cmds) > 1 or cmds[0] != '0'*len(cmds[0]);
+        # True if there is there more than one element in cmds, *or*
+        # if there is only one but it is not equal to a string of zeroes.
+        opened = len(cmds) > 1 or cmds[0] != '0' * len(cmds[0])
         classes = []
         for cmd in cmds:
             if cmd in ansi_colormap:
@@ -270,8 +276,8 b' def rst2simplehtml(infile):'
     walker = iter(html.splitlines())
 
     # Find start of main text, break out to then print until we find end /div.
-    # This may only work if there's a real title defined so we get a 'div class'
-    # tag, I haven't really tried.
+    # This may only work if there's a real title defined so we get a 'div
+    # class' tag, I haven't really tried.
     for line in walker:
         if line.startswith('<body>'):
             break
@@ -286,6 +292,7 b' def rst2simplehtml(infile):'
 
     return newfname
 
+
 #-----------------------------------------------------------------------------
 # Cell-level functions -- similar to IPython.nbformat.v3.rwbase functions
 # but at cell level instead of whole notebook level