diff --git a/.pylintrc b/.pylintrc index 6f9184431..8bc0b832c 100644 --- a/.pylintrc +++ b/.pylintrc @@ -59,4 +59,4 @@ defining-attr-methods=__init__,__new__,setUp max-args=10 [TYPECHECK] -ignored-classes=WebElementWrapper,AnsiCodes,UnsetObject +ignored-classes=WebElementWrapper,AnsiCodes,UnsetObject,MsgType diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py index cacc8d9c0..8071df77b 100644 --- a/qutebrowser/browser/urlmarks.py +++ b/qutebrowser/browser/urlmarks.py @@ -95,7 +95,8 @@ class UrlMarkManager(QObject): return self._init_lineparser() - for line in self._lineparser: + # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/685/ + for line in self._lineparser: # pylint: disable=not-an-iterable if not line.strip(): # Ignore empty or whitespace-only lines. continue diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 9dbcaf4cf..3868848c2 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -558,7 +558,8 @@ class ConfigManager(QObject): def _after_set(self, changed_sect, changed_opt): """Clean up caches and emit signals after an option has been set.""" - self.get.cache_clear() + # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/659/ + self.get.cache_clear() # pylint: disable=no-member self._changed(changed_sect, changed_opt) # Options in the same section and ${optname} interpolation. for optname, option in self.sections[changed_sect].items(): @@ -620,7 +621,8 @@ class ConfigManager(QObject): existed = optname in sectdict if existed: del sectdict[optname] - self.get.cache_clear() + # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/659/ + self.get.cache_clear() # pylint: disable=no-member return existed @functools.lru_cache() diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py index 9d00aa5fc..442f7b19d 100644 --- a/qutebrowser/config/configtypes.py +++ b/qutebrowser/config/configtypes.py @@ -171,6 +171,8 @@ class BaseType: if not value: return if self.valid_values is not None: + # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/685/ + # pylint: disable=unsupported-membership-test if value not in self.valid_values: raise configexc.ValidationError( value, "valid values: {}".format(', '.join( @@ -192,7 +194,8 @@ class BaseType: return None else: out = [] - for val in self.valid_values: + # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/685/ + for val in self.valid_values: # pylint: disable=not-an-iterable try: desc = self.valid_values.descriptions[val] except KeyError: @@ -330,7 +333,8 @@ class FlagList(List): out = [] # Single value completions - for value in self.valid_values: + # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/685/ + for value in self.valid_values: # pylint: disable=not-an-iterable desc = self.valid_values.descriptions.get(value, "") out.append((value, desc)) diff --git a/qutebrowser/config/sections.py b/qutebrowser/config/sections.py index 2a20b5b80..cecb5bcc9 100644 --- a/qutebrowser/config/sections.py +++ b/qutebrowser/config/sections.py @@ -62,6 +62,8 @@ class Section: def __contains__(self, key): """Return whether the section contains a given key.""" + # WORKAROUND for https://bitbucket.org/logilab/pylint/issues/685/ + # pylint: disable=unsupported-membership-test return key in self.values def items(self): diff --git a/qutebrowser/misc/ipc.py b/qutebrowser/misc/ipc.py index 30745bd05..680ba2e8d 100644 --- a/qutebrowser/misc/ipc.py +++ b/qutebrowser/misc/ipc.py @@ -340,7 +340,8 @@ class IPCServer(QObject): self._handle_invalid_data() return - cwd = json_data.get('cwd', None) + # WORKAROUND for https://bitbucket.org/logilab/astroid/issues/75/ + cwd = json_data.get('cwd', None) # pylint: disable=no-member self.got_args.emit(json_data['args'], json_data['target_arg'], cwd) @pyqtSlot()