summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2015-02-01 22:38:40 +0100
committerFlorian Bruhin <git@the-compiler.org>2015-02-01 22:38:40 +0100
commit503fc9f56b400f94f8fc3580690b167110cc7ebe (patch)
treeb59d7b4dc3ffd95ca5c9d3fdd59a3297e2ac1cd3
parent33a2181e318ae2a9558ecaeafecd168467f8b5fe (diff)
downloadqutebrowser-503fc9f56b400f94f8fc3580690b167110cc7ebe.tar.gz
qutebrowser-503fc9f56b400f94f8fc3580690b167110cc7ebe.zip
Re-enable some flake8 checks.
-rw-r--r--.flake813
-rw-r--r--qutebrowser/test/utils/test_utils.py5
2 files changed, 5 insertions, 13 deletions
diff --git a/.flake8 b/.flake8
index 672fbe55d..01183f3b9 100644
--- a/.flake8
+++ b/.flake8
@@ -1,19 +1,10 @@
# vim: ft=dosini fileencoding=utf-8:
[flake8]
-# E241: Multiple spaces after ,
# E265: Block comment should start with '#'
-# checked by pylint:
-# F401: Unused import
# E501: Line too long
-# F821: undefined name
# F841: unused variable
-# E222: Multiple spaces after operator
-# F811: Redifiniton
-# W292: No newline at end of file
-# E701: multiple statements on one line
-# E702: multiple statements on one line
-# E225: missing whitespace around operator
-ignore=E241,E265,F401,E501,F821,F841,E222,F811,W292,E701,E702,E225
+# F401: Unused import
+ignore=E265,E501,F841,F401
max_complexity = 12
exclude = ez_setup.py
diff --git a/qutebrowser/test/utils/test_utils.py b/qutebrowser/test/utils/test_utils.py
index a0db50b51..fec327097 100644
--- a/qutebrowser/test/utils/test_utils.py
+++ b/qutebrowser/test/utils/test_utils.py
@@ -331,8 +331,9 @@ class IsEnumTests(unittest.TestCase):
def test_class(self):
"""Test is_enum with a non-enum class."""
- # pylint: disable=multiple-statements,missing-docstring
- class Test: pass
+ class Test:
+ """Test class for is_enum"""
+ pass
self.assertFalse(utils.is_enum(Test))
def test_object(self):