diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 5598a0904..4fa65eee0 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -30,8 +30,8 @@ from PyQt5.QtWidgets import QWidget, QApplication from qutebrowser.keyinput import modeman from qutebrowser.config import config -from qutebrowser.utils import (utils, objreg, usertypes, log, qtutils, urlutils, - message) +from qutebrowser.utils import (utils, objreg, usertypes, log, qtutils, + urlutils, message) from qutebrowser.misc import miscwidgets, objects from qutebrowser.browser import mouse, hints diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index ef666c934..91c5bfab6 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -29,8 +29,7 @@ from PyQt5.QtWebEngineWidgets import (QWebEngineView, QWebEnginePage, from qutebrowser.browser import shared from qutebrowser.browser.webengine import certificateerror, webenginesettings from qutebrowser.config import config -from qutebrowser.utils import (log, debug, usertypes, jinja, urlutils, message, - objreg, qtutils) +from qutebrowser.utils import log, debug, usertypes, jinja, objreg, qtutils class WebEngineView(QWebEngineView): diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py index 89b205fa8..aebf53d87 100644 --- a/qutebrowser/browser/webkit/webpage.py +++ b/qutebrowser/browser/webkit/webpage.py @@ -33,8 +33,7 @@ from qutebrowser.config import config from qutebrowser.browser import pdfjs, shared from qutebrowser.browser.webkit import http from qutebrowser.browser.webkit.network import networkmanager -from qutebrowser.utils import (message, usertypes, log, jinja, objreg, debug, - urlutils) +from qutebrowser.utils import message, usertypes, log, jinja, objreg class BrowserPage(QWebPage): diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 341ecba93..be8aee85d 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -23,7 +23,6 @@ import copy import contextlib import functools -import attr from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject from qutebrowser.config import configdata, configexc, configutils @@ -234,8 +233,8 @@ class Config(QObject): """Main config object. Class attributes: - MUTABLE_TYPES: Types returned from the config which could potentially be - mutated. + MUTABLE_TYPES: Types returned from the config which could potentially + be mutated. Attributes: _values: A dict mapping setting names to configutils.Values objects. @@ -312,8 +311,8 @@ class Config(QObject): def _maybe_copy(self, value): """Copy the value if it could potentially be mutated.""" if isinstance(value, self.MUTABLE_TYPES): - # For mutable objects, create a copy so we don't accidentally mutate - # the config's internal value. + # For mutable objects, create a copy so we don't accidentally + # mutate the config's internal value. return copy.deepcopy(value) else: # Shouldn't be mutable (and thus hashable) @@ -332,8 +331,8 @@ class Config(QObject): def get_obj_for_pattern(self, name, *, pattern): """Get the given setting as object (for YAML/config.py). - This gets the overridden value for a given pattern, or configutils.UNSET - if no such override exists. + This gets the overridden value for a given pattern, or + configutils.UNSET if no such override exists. """ value = self._values[name].get_for_pattern(pattern, fallback=False) return self._maybe_copy(value) diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py index a527d47f1..f3f8e82b7 100644 --- a/qutebrowser/config/configcommands.py +++ b/qutebrowser/config/configcommands.py @@ -177,7 +177,8 @@ class ConfigCommands: @cmdutils.register(instance='config-commands', star_args_optional=True) @cmdutils.argument('option', completion=configmodel.option) @cmdutils.argument('values', completion=configmodel.value) - def config_cycle(self, option, *values, url=None, temp=False, print_=False): + def config_cycle(self, option, *values, url=None, temp=False, + print_=False): """Cycle an option between multiple values. Args: diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index 8a7476ca9..91735f536 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -102,7 +102,7 @@ class YamlConfig(QObject): save_manager.add_saveable('yaml-config', self._save, self.changed) def __iter__(self): - for name, values in sorted(self._values.items()): + for _name, values in sorted(self._values.items()): yield from values def _mark_changed(self): @@ -217,7 +217,7 @@ class YamlConfig(QObject): def _validate(self): """Make sure all settings exist.""" unknown = [] - for _pattern, name, value in self: + for _pattern, name, _value in self: # FIXME:conf show pattern if name not in configdata.DATA: unknown.append(name) diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py index 2831af01e..f4b5d9820 100644 --- a/qutebrowser/config/websettings.py +++ b/qutebrowser/config/websettings.py @@ -231,7 +231,7 @@ def update_for_tab(mappings, tab, url): value = values.get_for_url(url, fallback=False) # FIXME:conf have a proper API for this. - settings = tab._widget.settings() + settings = tab._widget.settings() # pylint: disable=protected-access if value is configutils.UNSET: try: diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py index 446f53bb2..c59db211b 100644 --- a/qutebrowser/utils/urlmatch.py +++ b/qutebrowser/utils/urlmatch.py @@ -104,6 +104,7 @@ class UrlPattern: return hash(self._to_tuple()) def __eq__(self, other): + # pylint: disable=protected-access return self._to_tuple() == other._to_tuple() def _fixup_pattern(self, pattern): diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py index 06b70fc21..039d805f9 100644 --- a/qutebrowser/utils/usertypes.py +++ b/qutebrowser/utils/usertypes.py @@ -400,6 +400,8 @@ class AbstractCertificateErrorWrapper: @attr.s class NavigationRequest: + """A request to navigate to the given URL.""" + Type = enum.Enum('Type', [ 'link_clicked', 'typed', # QtWebEngine only