summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2015-03-18 23:13:24 +0100
committerFlorian Bruhin <git@the-compiler.org>2015-03-19 06:21:08 +0100
commita126924c4253b68cb54f012a8e55e3939d25afff (patch)
tree545c66c14d09f672cb4398a258f6e1ff719b0ba4
parenta0381e168353c54995b2000e770cd0fdd53a49e5 (diff)
downloadqutebrowser-a126924c4253b68cb54f012a8e55e3939d25afff.tar.gz
qutebrowser-a126924c4253b68cb54f012a8e55e3939d25afff.zip
Fix lint.
-rw-r--r--.flake817
-rw-r--r--.pylintrc9
2 files changed, 13 insertions, 13 deletions
diff --git a/.flake8 b/.flake8
index 672fbe55d..5233b8c31 100644
--- a/.flake8
+++ b/.flake8
@@ -1,19 +1,12 @@
# 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
+# E402: module level import not at top of file
+# E266: too many leading '#' for block comment
+# W503: line break before binary operator
+ignore=E265,E501,F841,F401,E402,E266,W503
max_complexity = 12
-exclude = ez_setup.py
diff --git a/.pylintrc b/.pylintrc
index 8cb7a35fd..984b56b27 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -2,6 +2,7 @@
[MASTER]
ignore=ez_setup.py
+extension-pkg-whitelist=PyQt5,sip
[MESSAGES CONTROL]
disable=no-self-use,
@@ -23,7 +24,13 @@ disable=no-self-use,
too-many-instance-attributes,
unnecessary-lambda,
blacklisted-name,
- too-many-lines
+ too-many-lines,
+ logging-format-interpolation,
+ interface-not-implemented,
+ broad-except,
+ bare-except,
+ eval-used,
+ exec-used
[BASIC]
module-rgx=(__)?[a-z][a-z0-9_]*(__)?$