Merge branch 'pylint-assignment-from-no-return' of git://github.com/e…

…lmirjagudin/buildbot
buildbot · Aug 26, 2013 · b4156da · b4156da
2 parents 76c34d5 + 7af8fd4
commit b4156da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/common/pylintrc b/common/pylintrc
@@ -101,7 +101,6 @@ disable=
   E1002,
   E1101,
   E1102,
-  E1111,
   E1120,
   E1121,
   E1123,

diff --git a/master/buildbot/test/unit/test_util_misc.py b/master/buildbot/test/unit/test_util_misc.py
@@ -54,7 +54,8 @@ def test_fn_exception(self):
         @util.deferredLocked(l)
         def do_fail():
             raise RuntimeError("oh noes")
-        d = do_fail()
+        # using decorators confuses pylint and gives a false positive below
+        d = do_fail()           # pylint: disable=assignment-from-no-return
         def check_unlocked(_):
             self.assertFalse(l.locked)
         d.addCallbacks(lambda _ : self.fail("didn't errback"),