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