pylint: enable inconsistent-return-statements

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
[rlb@defaultvalue.org: return early for dry run in import_duplicity exo]
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/.pylintrc b/.pylintrc
index 0f7c2ed7348294f4e14d1755022e78a90d9524b6..f9e3dfb32bb574da09605a83f1967d24ca67c9f2 100644 (file)
--- a/.pylintrc
+++ b/.pylintrc
@@ -5,6 +5,7 @@ disable=all
 enable=
   catching-non-exception,
   consider-using-in,
+  inconsistent-return-statements,
   return-in-init,
   trailing-whitespace,
   undefined-variable,

diff --git a/lib/bup/client.py b/lib/bup/client.py
index 6eeb7081c669d2636ce026f6a9623ec376817e21..25320545b876dc034663daa6a3c9c22496d01700 100644 (file)
--- a/lib/bup/client.py
+++ b/lib/bup/client.py
@@ -158,6 +158,8 @@ class Client:
             return self.conn.check_ok()
         except Exception as e:
             reraise(ClientError(e))
+            # reraise doesn't return
+            return None
 
     def check_busy(self):
         if self._busy:
@@ -515,6 +517,7 @@ class PackWriter_Remote(git.PackWriter):
             self.onclose() # Unbusy
             self.objcache = None
             return self.suggest_packs() # Returns last idx received
+        return None
 
     def close(self):
         id = self._end()

diff --git a/lib/bup/cmd/ftp.py b/lib/bup/cmd/ftp.py
index 4694dd95bc596484e30da2e26924b3e12c6cab55..99121f0dc76d539fac313d085362b508a2dc22f1 100755 (executable)
--- a/lib/bup/cmd/ftp.py
+++ b/lib/bup/cmd/ftp.py
@@ -26,7 +26,7 @@ def do_ls(repo, pwd, args, out):
         opt = ls.opts_from_cmdline(args, onabort=OptionError, pwd=pwd_str)
     except OptionError as e:
         log('error: %s' % e)
-        return
+        return None
     return ls.within_repo(repo, opt, out, pwd_str)
 
 
@@ -90,6 +90,7 @@ def enter_completion(text, iteration):
         except Exception as e2:
             log('Error printing traceback: %s\n' % e2)
         log('\nError in completion: %s\n' % e)
+    return None
 
 
 optspec = """

diff --git a/lib/bup/cmd/fuse.py b/lib/bup/cmd/fuse.py
index b1be8ac00cd1007a8f94dbcfdde0927dfa10f818..385bea9f3a8d0f2d8865db310afce464f97a8f22 100755 (executable)
--- a/lib/bup/cmd/fuse.py
+++ b/lib/bup/cmd/fuse.py
@@ -106,6 +106,7 @@ class BupFs(fuse.Fuse):
         # Return None since read doesn't need the file atm...
         # If we *do* return the file, it'll show up as the last argument
         #return vfs.fopen(repo, item)
+        return None
 
     def read(self, path, size, offset):
         path = argv_bytes(path)

diff --git a/lib/bup/cmd/get.py b/lib/bup/cmd/get.py
index 8629f4fd10c3f2693817c0472fb36c3c6a23eb10..599dcc6b489c1aee2f5a128e087c2ca1a2abe197 100755 (executable)
--- a/lib/bup/cmd/get.py
+++ b/lib/bup/cmd/get.py
@@ -370,6 +370,8 @@ def handle_ff(item, src_repo, writer, opt):
         return item.src.hash, unhexlify(commit_items.tree)
     misuse('destination is not an ancestor of source for %s'
            % spec_msg(item.spec))
+    # misuse() doesn't return
+    return None
 
 
 def resolve_append(spec, src_repo, dest_repo):

diff --git a/lib/bup/cmd/import_duplicity.py b/lib/bup/cmd/import_duplicity.py
index 78ed1ee2fa8105b9f311ec641cedc9d1f09bf168..3e3cce74a7a0f66845897ad840a153ca68f1b3b3 100755 (executable)
--- a/lib/bup/cmd/import_duplicity.py
+++ b/lib/bup/cmd/import_duplicity.py
@@ -31,9 +31,10 @@ def exc(cmd, shell=False):
 
 def exo(cmd, shell=False, preexec_fn=None, close_fds=True):
     logcmd(cmd)
-    if not dry_run:
-        return helpers.exo(cmd, shell=shell, preexec_fn=preexec_fn,
-                           close_fds=close_fds)[0]
+    if dry_run:
+        return b''
+    return helpers.exo(cmd, shell=shell, preexec_fn=preexec_fn,
+                       close_fds=close_fds)[0]
 
 def redirect_dup_output():
     os.dup2(1, 3)

diff --git a/lib/bup/cmd/midx.py b/lib/bup/cmd/midx.py
index 983ba334db31a014cd13f67d39bc4819dddf3ac0..604f7e3b9e31e07aa07aaa90cb7ed9e4d0d2a467 100755 (executable)
--- a/lib/bup/cmd/midx.py
+++ b/lib/bup/cmd/midx.py
@@ -116,7 +116,7 @@ def _do_midx(outdir, outfilename, infilenames, prefixstr,
            or ((auto or force) and len(infilenames) < 2) \
            or (force and not total):
             debug1('midx: nothing to do.\n')
-            return
+            return None
 
         pages = int(total/SHA_PER_PAGE) or 1
         bits = int(math.ceil(math.log(pages, 2)))

diff --git a/lib/bup/cmd/restore.py b/lib/bup/cmd/restore.py
index aeb1c7ba2955feccde69057ffb40c178e7a15d92..ee403b6c20d199fdf9c023a1c9e81665c7349d0a 100755 (executable)
--- a/lib/bup/cmd/restore.py
+++ b/lib/bup/cmd/restore.py
@@ -44,6 +44,7 @@ def valid_restore_path(path):
         path = path[1:]
     if b'/' in path:
         return True
+    return False
 
 def parse_owner_mappings(type, options, fatal):
     """Traverse the options and parse all --map-TYPEs, or call Option.fatal()."""

diff --git a/lib/bup/cmd/save.py b/lib/bup/cmd/save.py
index 70c7159b2867e0d7f8105f237849fbe92a7e3680..1325b4d96544632b5c41df680db093088adbede9 100755 (executable)
--- a/lib/bup/cmd/save.py
+++ b/lib/bup/cmd/save.py
@@ -269,6 +269,7 @@ def main(argv):
             link_paths = hlink_db.node_paths(ent.dev, ent.ino)
             if link_paths:
                 return link_paths[0]
+        return None
 
     total = ftotal = 0
     if opt.progress:

diff --git a/lib/bup/cmd/web.py b/lib/bup/cmd/web.py
index d83fb12ff73ee196ef2a9af3314a9edd5014f484..7de8ed72c6bcc840f8bdfd6ef70c69a403c77b74 100755 (executable)
--- a/lib/bup/cmd/web.py
+++ b/lib/bup/cmd/web.py
@@ -159,6 +159,7 @@ class BupRequestHandler(tornado.web.RequestHandler):
             hidden_shown=show_hidden,
             dir_contents=_dir_contents(self.repo, resolution,
                                        show_hidden=show_hidden))
+        return None
 
     @gen.coroutine
     def _get_file(self, repo, path, resolved):

diff --git a/lib/bup/git.py b/lib/bup/git.py
index cccc44ef97655f79a8755d65990c55edae1c1e02..ce8041a7be7e8cfaf26ced58edd0df7f5689847b 100644 (file)
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -263,8 +263,7 @@ def demangle_name(name, mode):
     elif name.endswith(b'.bupm'):
         return (name[:-5],
                 BUP_CHUNKED if stat.S_ISDIR(mode) else BUP_NORMAL)
-    else:
-        return (name, BUP_NORMAL)
+    return (name, BUP_NORMAL)
 
 
 def calc_hash(type, content):
@@ -1269,6 +1268,7 @@ class CatPipe:
         if wait:
             p.wait()
             return p.returncode
+        return None
 
     def restart(self):
         self.close()

diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py
index e2f543f6cf1af29054df8ac9b18dd72da0db930c..93fa9e1643969e8ccd9b4652a1c4d62a6c6d76e0 100644 (file)
--- a/lib/bup/helpers.py
+++ b/lib/bup/helpers.py
@@ -273,6 +273,8 @@ def quote(x):
     if isinstance(x, compat.str_type):
         return squote(x)
     assert False
+    # some versions of pylint get confused
+    return None
 
 def shstr(cmd):
     """Return a shell quoted string for cmd if it's a sequence, else cmd.
@@ -908,7 +910,7 @@ def handle_ctrl_c():
         if exctype == KeyboardInterrupt:
             log('\nInterrupted.\n')
         else:
-            return oldhook(exctype, value, traceback)
+            oldhook(exctype, value, traceback)
     sys.excepthook = newhook
 
 

diff --git a/lib/bup/vfs.py b/lib/bup/vfs.py
index 09bb1d37e33562bc9ff4cf1e8ed481a9edd9120f..09267f4c3e634fa1cf511cdb80cb2c8b6112adb1 100644 (file)
--- a/lib/bup/vfs.py
+++ b/lib/bup/vfs.py
@@ -398,6 +398,7 @@ def is_valid_cache_key(x):
             return True
         if tag == b'res:':
             return True
+    return False
 
 def cache_get(key):
     global _cache

diff --git a/test/int/test_index.py b/test/int/test_index.py
index d00260ea388e0cb18ceeb6cee0fe6642902b3a4b..f24b719a67dc8e671410fb0296fcd514779f045f 100644 (file)
--- a/test/int/test_index.py
+++ b/test/int/test_index.py
@@ -60,6 +60,7 @@ def eget(l, ename):
     for e in l:
         if e.name == ename:
             return e
+    return None
 
 def test_index_negative_timestamps(tmpdir):
     # Makes 'foo' exist