pylint: enable useless-return

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/.pylintrc b/.pylintrc
index 693101b466eb5c5aa6d28faa48f1e891ba2d01d3..1b6370b8f765dfc15c2be8a952cf314f20cd2a32 100644 (file)
--- a/.pylintrc
+++ b/.pylintrc
@@ -6,4 +6,5 @@ enable=
   return-in-init,
   trailing-whitespace,
   unused-import,
-  unused-wildcard-import
+  unused-wildcard-import,
+  useless-return

diff --git a/lib/bup/cmd/ftp.py b/lib/bup/cmd/ftp.py
index 8b7fe9d8d137e7ed1fdb5323d14eb0f20e4468b5..33fd8046407b46636579971bd818071796405e59 100755 (executable)
--- a/lib/bup/cmd/ftp.py
+++ b/lib/bup/cmd/ftp.py
@@ -55,7 +55,6 @@ def attempt_completion(text, start, end):
     global _attempt_start, _attempt_end
     _attempt_start = start
     _attempt_end = end
-    return None
 
 _last_line = None
 _last_res = None

diff --git a/lib/bup/compat.py b/lib/bup/compat.py
index fb45ead5d6e100fdcc0d37910d42e69f6e72793c..c3225a5ccdf9bdea155e2f65c16b9587ad34b9f9 100644 (file)
--- a/lib/bup/compat.py
+++ b/lib/bup/compat.py
@@ -49,7 +49,6 @@ if py3:
         def __exit__(self, exc_type, exc_value, traceback):
             if not exc_type:
                 raise self.ex
-            return None
 
     def items(x):
         return x.items()
@@ -131,13 +130,11 @@ else:  # Python 2
             self.ex = ex
         def __enter__(self):
             add_ex_tb(self.ex)
-            return None
         def __exit__(self, exc_type, exc_value, traceback):
             if not exc_type:
                 raise self.ex
             add_ex_tb(exc_value)
             add_ex_ctx(exc_value, self.ex)
-            return None
 
     def dump_traceback(ex):
         stack = [ex]