pylint: enable return-in-init

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 0b67f81dd5653503aa2c07cee4a327a1e395da14..693101b466eb5c5aa6d28faa48f1e891ba2d01d3 100644 (file)
--- a/.pylintrc
+++ b/.pylintrc
@@ -3,6 +3,7 @@
 [MESSAGES CONTROL]
 disable=all
 enable=
+  return-in-init,
   trailing-whitespace,
   unused-import,
   unused-wildcard-import

diff --git a/lib/bup/bloom.py b/lib/bup/bloom.py
index cb9821416504ea0f198d19cbe70a8b6cfaac6cec..05ebd714b696da13ee1172a24df85c1aae1517ae 100644 (file)
--- a/lib/bup/bloom.py
+++ b/lib/bup/bloom.py
@@ -145,16 +145,19 @@ class ShaBloom:
         got = self.map[0:4]
         if got != b'BLOM':
             log('Warning: invalid BLOM header (%r) in %r\n' % (got, filename))
-            return self._init_failed()
+            self._init_failed()
+            return
         ver = struct.unpack('!I', self.map[4:8])[0]
         if ver < BLOOM_VERSION:
             log('Warning: ignoring old-style (v%d) bloom %r\n'
                 % (ver, filename))
-            return self._init_failed()
+            self._init_failed()
+            return
         if ver > BLOOM_VERSION:
             log('Warning: ignoring too-new (v%d) bloom %r\n'
                 % (ver, filename))
-            return self._init_failed()
+            self._init_failed()
+            return
 
         self.bits, self.k, self.entries = struct.unpack('!HHI', self.map[8:16])
         idxnamestr = self.map[16 + 2**self.bits:]

diff --git a/lib/bup/midx.py b/lib/bup/midx.py
index 84e7969bb20e74ca80b2d731b6ceb60eac20da7b..2952a432333bf4769e04b11374ba9be58bf3cfb9 100644 (file)
--- a/lib/bup/midx.py
+++ b/lib/bup/midx.py
@@ -31,18 +31,21 @@ class PackMidx:
             log('Warning: skipping: invalid MIDX header in %r\n'
                 % path_msg(filename))
             self.force_keep = True
-            return self._init_failed()
+            self._init_failed()
+            return
         ver = struct.unpack('!I', self.map[4:8])[0]
         if ver < MIDX_VERSION:
             log('Warning: ignoring old-style (v%d) midx %r\n'
                 % (ver, path_msg(filename)))
             self.force_keep = False  # old stuff is boring
-            return self._init_failed()
+            self._init_failed()
+            return
         if ver > MIDX_VERSION:
             log('Warning: ignoring too-new (v%d) midx %r\n'
                 % (ver, path_msg(filename)))
             self.force_keep = True  # new stuff is exciting
-            return self._init_failed()
+            self._init_failed()
+            return
 
         self.bits = _helpers.firstword(self.map[8:12])
         self.entries = 2**self.bits