helpers.py: always use two blank lines between functions/classes.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>

diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py
index 62d5b26c32d1a7dbf82a9007ecc51c489a8b748b..41c5229128fb7f5fae3735f21763ae0b7a8235ba 100644 (file)
--- a/lib/bup/helpers.py
+++ b/lib/bup/helpers.py
@@ -202,9 +202,11 @@ def resource_path(subdir=''):
         _resource_path = os.environ.get('BUP_RESOURCE_PATH') or '.'
     return os.path.join(_resource_path, subdir)
 
+
 class NotOk(Exception):
     pass
 
+
 class BaseConn:
     def __init__(self, outp):
         self.outp = outp
@@ -268,6 +270,7 @@ class BaseConn:
             raise Exception('expected "ok", got %r' % rl)
         return self._check_ok(onempty)
 
+
 class Conn(BaseConn):
     def __init__(self, inp, outp):
         BaseConn.__init__(self, outp)
@@ -287,6 +290,7 @@ class Conn(BaseConn):
         else:
             return None
 
+
 def checked_reader(fd, n):
     while n > 0:
         rl, _, _ = select.select([fd], [], [])
@@ -296,6 +300,7 @@ def checked_reader(fd, n):
         yield buf
         n -= len(buf)
 
+
 MAX_PACKET = 128 * 1024
 def mux(p, outfd, outr, errr):
     try:
@@ -314,6 +319,7 @@ def mux(p, outfd, outr, errr):
     finally:
         os.write(outfd, struct.pack('!IB', 0, 3))
 
+
 class DemuxConn(BaseConn):
     """A helper class for bup's client-server protocol."""
     def __init__(self, infd, outp):
@@ -402,6 +408,7 @@ class DemuxConn(BaseConn):
     def has_input(self):
         return self._load_buf(0)
 
+
 def linereader(f):
     """Generate a list of input lines from 'f' without terminating newlines."""
     while 1:
@@ -515,6 +522,7 @@ def add_error(e):
     saved_errors.append(e)
     log('%-70s\n' % e)
 
+
 istty = os.isatty(2) or atoi(os.environ.get('BUP_FORCE_TTY'))
 def progress(s):
     """Calls log(s) if stderr is a TTY.  Does nothing otherwise."""
@@ -562,6 +570,7 @@ def columnate(l, prefix):
         out += prefix + ''.join(('%-*s' % (clen+2, s)) for s in row) + '\n'
     return out
 
+
 def parse_date_or_fatal(str, fatal):
     """Parses the given date or calls Option.fatal().
     For now we expect a string that contains a float."""
@@ -572,6 +581,7 @@ def parse_date_or_fatal(str, fatal):
     else:
         return date
 
+
 def strip_path(prefix, path):
     """Strips a given prefix from a path.
 
@@ -591,6 +601,7 @@ def strip_path(prefix, path):
     else:
         return path
 
+
 def strip_base_path(path, base_paths):
     """Strips the base path from a given path.
 
@@ -607,6 +618,7 @@ def strip_base_path(path, base_paths):
             return strip_path(bp, normalized_path)
     return path
 
+
 def graft_path(graft_points, path):
     normalized_path = os.path.realpath(path)
     for graft_point in graft_points:
@@ -633,10 +645,12 @@ def version_date():
     """Format bup's version date string for output."""
     return _version.DATE.split(' ')[0]
 
+
 def version_commit():
     """Get the commit hash of bup's current version."""
     return _version.COMMIT
 
+
 def version_tag():
     """Format bup's version tag (the official version number).