summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2014-09-15 22:01:13 +0200
committerFlorian Bruhin <git@the-compiler.org>2014-09-15 22:01:13 +0200
commitd1ddc8c6cbfd6c24006a23977ed0c169f4bce698 (patch)
treef00989a5899c9f1e083db4fb6143a700077cacee
parentf5ecba0d0771a7361ef5bf9613fcc331597add57 (diff)
downloadqutebrowser-d1ddc8c6cbfd6c24006a23977ed0c169f4bce698.tar.gz
qutebrowser-d1ddc8c6cbfd6c24006a23977ed0c169f4bce698.zip
Fix lint
-rw-r--r--.flake83
-rw-r--r--.pylintrc2
-rw-r--r--qutebrowser/browser/commands.py2
-rw-r--r--qutebrowser/config/config.py6
-rw-r--r--qutebrowser/utils/version.py3
5 files changed, 10 insertions, 6 deletions
diff --git a/.flake8 b/.flake8
index 0c7c865d4..7eb1c2210 100644
--- a/.flake8
+++ b/.flake8
@@ -12,6 +12,7 @@
# F811: Redifiniton
# W292: No newline at end of file
# E702: multiple statements on one line
-ignore=E241,E265,F401,E501,F821,F841,E222,F811,W292,E702
+# E225: missing whitespace around operator
+ignore=E241,E265,F401,E501,F821,F841,E222,F811,W292,E702,E225
max_complexity = 12
exclude = ez_setup.py
diff --git a/.pylintrc b/.pylintrc
index 83ffc5fc1..f161de012 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -53,4 +53,4 @@ defining-attr-methods=__init__,__new__,setUp
max-args=10
[TYPECHECK]
-ignored-classes=WebElementWrapper
+ignored-classes=WebElementWrapper,AnsiCodes
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 2874c5623..dde6d940e 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -753,6 +753,8 @@ class CommandDispatcher:
@cmdutils.register(instance='mainwindow.tabs.cmd')
def view_source(self):
"""Show the source of the current page."""
+ # pylint doesn't seem to like pygments...
+ # pylint: disable=no-member
widget = self._current_widget()
if widget.viewing_source:
raise cmdexc.CommandError("Already viewing source!")
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 514b766dd..a3e9565e9 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -128,7 +128,7 @@ class ConfigManager(QObject):
for sectname in self.sections.keys():
self._proxies[sectname] = SectionProxy(self, sectname)
self._from_cp(self._configparser)
- self._initialized=True
+ self._initialized = True
def __getitem__(self, key):
"""Get a section from the config."""
@@ -249,8 +249,8 @@ class ConfigManager(QObject):
if '${' + changed_opt + '}' in option.value():
self._emit_changed(changed_sect, optname)
# Options in any section and ${sectname:optname} interpolation.
- for sectname, section in self.sections.items():
- for optname, option in section.items():
+ for sectname, sect in self.sections.items():
+ for optname, option in sect.items():
if ('${' + changed_sect + ':' + changed_opt + '}' in
option.value()):
self._emit_changed(sectname, optname)
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 56a92b0fb..e9048c564 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -122,7 +122,8 @@ def _module_versions():
Return:
A list of lines with version info.
"""
- # pylint: disable=import-error,unused-variable
+ # We should find a way to rewrite this using __import__ or so.
+ # pylint: disable=import-error,unused-variable,too-many-branches
lines = []
try:
import sipconfig