diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py index 619f75120..d08f191a8 100644 --- a/qutebrowser/browser/mouse.py +++ b/qutebrowser/browser/mouse.py @@ -19,15 +19,13 @@ """Mouse handling for a browser tab.""" +from PyQt5.QtCore import QObject, QEvent, Qt, QTimer from qutebrowser.config import config from qutebrowser.utils import message, log, usertypes from qutebrowser.keyinput import modeman -from PyQt5.QtCore import QObject, QEvent, Qt, QTimer - - class ChildEventFilter(QObject): """An event filter re-adding MouseEventFilter on ChildEvent. diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py index 7f5173943..8997f4b0c 100644 --- a/qutebrowser/browser/webkit/http.py +++ b/qutebrowser/browser/webkit/http.py @@ -22,11 +22,11 @@ import os.path +from PyQt5.QtNetwork import QNetworkRequest + from qutebrowser.utils import log from qutebrowser.browser.webkit import rfc6266 -from PyQt5.QtNetwork import QNetworkRequest - def parse_content_disposition(reply): """Parse a content_disposition header. diff --git a/qutebrowser/utils/jinja.py b/qutebrowser/utils/jinja.py index b6f53645b..802fc5fff 100644 --- a/qutebrowser/utils/jinja.py +++ b/qutebrowser/utils/jinja.py @@ -28,10 +28,10 @@ import html import jinja2 import jinja2.exceptions +from PyQt5.QtCore import QUrl from qutebrowser.utils import utils, urlutils, log -from PyQt5.QtCore import QUrl html_fallback = """ diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py index 7f80d6acb..309793ddc 100644 --- a/tests/end2end/conftest.py +++ b/tests/end2end/conftest.py @@ -29,8 +29,6 @@ import pstats import os.path import operator -from qutebrowser.browser.webengine import spell - import pytest from PyQt5.QtCore import PYQT_VERSION @@ -41,6 +39,7 @@ from end2end.fixtures.quteprocess import (quteproc_process, quteproc, quteproc_new) from end2end.fixtures.testprocess import pytest_runtest_makereport from qutebrowser.utils import qtutils, utils +from qutebrowser.browser.webengine import spell def pytest_configure(config): diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py index 5cbf01aad..715e0168d 100644 --- a/tests/helpers/fixtures.py +++ b/tests/helpers/fixtures.py @@ -35,6 +35,10 @@ import types import attr import pytest import py.path # pylint: disable=no-name-in-module +from PyQt5.QtCore import QEvent, QSize, Qt +from PyQt5.QtGui import QKeyEvent +from PyQt5.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout +from PyQt5.QtNetwork import QNetworkCookieJar import helpers.stubs as stubsmod import helpers.utils @@ -44,11 +48,6 @@ from qutebrowser.browser.webkit import cookies from qutebrowser.misc import savemanager, sql from qutebrowser.keyinput import modeman -from PyQt5.QtCore import QEvent, QSize, Qt -from PyQt5.QtGui import QKeyEvent -from PyQt5.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout -from PyQt5.QtNetwork import QNetworkCookieJar - class WinRegistryHelper: diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py index 9efbc6a4e..b4e9742bc 100644 --- a/tests/unit/config/test_configfiles.py +++ b/tests/unit/config/test_configfiles.py @@ -24,13 +24,12 @@ import unittest.mock import textwrap import pytest +from PyQt5.QtCore import QSettings from qutebrowser.config import (config, configfiles, configexc, configdata, configtypes) from qutebrowser.utils import utils, usertypes -from PyQt5.QtCore import QSettings - @pytest.fixture(autouse=True) def configdata_init(): diff --git a/tests/unit/keyinput/test_modeman.py b/tests/unit/keyinput/test_modeman.py index d00ce09f7..5185636a6 100644 --- a/tests/unit/keyinput/test_modeman.py +++ b/tests/unit/keyinput/test_modeman.py @@ -19,10 +19,10 @@ import pytest -from qutebrowser.utils import usertypes - from PyQt5.QtCore import Qt, QObject, pyqtSignal +from qutebrowser.utils import usertypes + class FakeKeyparser(QObject): diff --git a/tests/unit/misc/test_msgbox.py b/tests/unit/misc/test_msgbox.py index cab72c251..783816011 100644 --- a/tests/unit/misc/test_msgbox.py +++ b/tests/unit/misc/test_msgbox.py @@ -20,12 +20,12 @@ import pytest -from qutebrowser.misc import msgbox -from qutebrowser.utils import utils - from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QMessageBox, QWidget +from qutebrowser.misc import msgbox +from qutebrowser.utils import utils + @pytest.fixture(autouse=True) def patch_args(fake_args): diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py index 89c442b2b..8df08adc3 100644 --- a/tests/unit/misc/test_sql.py +++ b/tests/unit/misc/test_sql.py @@ -20,10 +20,11 @@ """Test the SQL API.""" import pytest -from qutebrowser.misc import sql from PyQt5.QtSql import QSqlError +from qutebrowser.misc import sql + pytestmark = pytest.mark.usefixtures('init_sql') diff --git a/tests/unit/utils/test_error.py b/tests/unit/utils/test_error.py index 47a1c52d9..43ebc01b7 100644 --- a/tests/unit/utils/test_error.py +++ b/tests/unit/utils/test_error.py @@ -21,13 +21,12 @@ import logging import pytest +from PyQt5.QtCore import QTimer +from PyQt5.QtWidgets import QMessageBox from qutebrowser.utils import error, utils from qutebrowser.misc import ipc -from PyQt5.QtCore import QTimer -from PyQt5.QtWidgets import QMessageBox - class Error(Exception): diff --git a/tests/unit/utils/test_log.py b/tests/unit/utils/test_log.py index 2ab51002d..fb2723cc6 100644 --- a/tests/unit/utils/test_log.py +++ b/tests/unit/utils/test_log.py @@ -28,12 +28,11 @@ import warnings import attr import pytest import _pytest.logging +from PyQt5 import QtCore from qutebrowser.utils import log from qutebrowser.misc import utilcmds -from PyQt5 import QtCore - @pytest.fixture(autouse=True) def restore_loggers(): diff --git a/tests/unit/utils/usertypes/test_neighborlist.py b/tests/unit/utils/usertypes/test_neighborlist.py index 751f940a3..804ed51ed 100644 --- a/tests/unit/utils/usertypes/test_neighborlist.py +++ b/tests/unit/utils/usertypes/test_neighborlist.py @@ -19,10 +19,10 @@ """Tests for the NeighborList class.""" -from qutebrowser.utils import usertypes - import pytest +from qutebrowser.utils import usertypes + class TestInit: diff --git a/tests/unit/utils/usertypes/test_timer.py b/tests/unit/utils/usertypes/test_timer.py index d120d82e6..81ea6feae 100644 --- a/tests/unit/utils/usertypes/test_timer.py +++ b/tests/unit/utils/usertypes/test_timer.py @@ -19,11 +19,11 @@ """Tests for Timer.""" -from qutebrowser.utils import usertypes - import pytest from PyQt5.QtCore import QObject +from qutebrowser.utils import usertypes + class Parent(QObject):