rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong import order

Browse Source
This commit is contained in:
Florian Bruhin 2017-12-15 14:35:07 +01:00
parent a4101662b2
commit e76732693c
13 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/browser/mouse.py
View File

@ -19,15 +19,13 @@
"""Mouse handling for a browser tab.""" """Mouse handling for a browser tab."""
from PyQt5.QtCore import QObject, QEvent, Qt, QTimer
from qutebrowser.config import config from qutebrowser.config import config
from qutebrowser.utils import message, log, usertypes from qutebrowser.utils import message, log, usertypes
from qutebrowser.keyinput import modeman from qutebrowser.keyinput import modeman
from PyQt5.QtCore import QObject, QEvent, Qt, QTimer
class ChildEventFilter(QObject): class ChildEventFilter(QObject):
"""An event filter re-adding MouseEventFilter on ChildEvent. """An event filter re-adding MouseEventFilter on ChildEvent.

4
qutebrowser/browser/webkit/http.py
View File

@ -22,11 +22,11 @@
import os.path import os.path
from PyQt5.QtNetwork import QNetworkRequest
from qutebrowser.utils import log from qutebrowser.utils import log
from qutebrowser.browser.webkit import rfc6266 from qutebrowser.browser.webkit import rfc6266
from PyQt5.QtNetwork import QNetworkRequest
def parse_content_disposition(reply): def parse_content_disposition(reply):
"""Parse a content_disposition header. """Parse a content_disposition header.

2
qutebrowser/utils/jinja.py
View File

@ -28,10 +28,10 @@ import html
import jinja2 import jinja2
import jinja2.exceptions import jinja2.exceptions
from PyQt5.QtCore import QUrl
from qutebrowser.utils import utils, urlutils, log from qutebrowser.utils import utils, urlutils, log
from PyQt5.QtCore import QUrl
html_fallback = """ html_fallback = """
<!DOCTYPE html> <!DOCTYPE html>

3
tests/end2end/conftest.py
View File

@ -29,8 +29,6 @@ import pstats
import os.path import os.path
import operator import operator
from qutebrowser.browser.webengine import spell
import pytest import pytest
from PyQt5.QtCore import PYQT_VERSION from PyQt5.QtCore import PYQT_VERSION
@ -41,6 +39,7 @@ from end2end.fixtures.quteprocess import (quteproc_process, quteproc,
quteproc_new) quteproc_new)
from end2end.fixtures.testprocess import pytest_runtest_makereport from end2end.fixtures.testprocess import pytest_runtest_makereport
from qutebrowser.utils import qtutils, utils from qutebrowser.utils import qtutils, utils
from qutebrowser.browser.webengine import spell
def pytest_configure(config): def pytest_configure(config):

9
tests/helpers/fixtures.py
View File

@ -35,6 +35,10 @@ import types
import attr import attr
import pytest import pytest
import py.path # pylint: disable=no-name-in-module 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.stubs as stubsmod
import helpers.utils import helpers.utils
@ -44,11 +48,6 @@ from qutebrowser.browser.webkit import cookies
from qutebrowser.misc import savemanager, sql from qutebrowser.misc import savemanager, sql
from qutebrowser.keyinput import modeman 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: class WinRegistryHelper:

3
tests/unit/config/test_configfiles.py
View File

@ -24,13 +24,12 @@ import unittest.mock
import textwrap import textwrap
import pytest import pytest
from PyQt5.QtCore import QSettings
from qutebrowser.config import (config, configfiles, configexc, configdata, from qutebrowser.config import (config, configfiles, configexc, configdata,
configtypes) configtypes)
from qutebrowser.utils import utils, usertypes from qutebrowser.utils import utils, usertypes
from PyQt5.QtCore import QSettings
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def configdata_init(): def configdata_init():

4
tests/unit/keyinput/test_modeman.py
View File

@ -19,10 +19,10 @@
import pytest import pytest
from qutebrowser.utils import usertypes
from PyQt5.QtCore import Qt, QObject, pyqtSignal from PyQt5.QtCore import Qt, QObject, pyqtSignal
from qutebrowser.utils import usertypes
class FakeKeyparser(QObject): class FakeKeyparser(QObject):

6
tests/unit/misc/test_msgbox.py
View File

@ -20,12 +20,12 @@
import pytest import pytest
from qutebrowser.misc import msgbox
from qutebrowser.utils import utils
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QMessageBox, QWidget from PyQt5.QtWidgets import QMessageBox, QWidget
from qutebrowser.misc import msgbox
from qutebrowser.utils import utils
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def patch_args(fake_args): def patch_args(fake_args):

3
tests/unit/misc/test_sql.py
View File

@ -20,10 +20,11 @@
"""Test the SQL API.""" """Test the SQL API."""
import pytest import pytest
from qutebrowser.misc import sql
from PyQt5.QtSql import QSqlError from PyQt5.QtSql import QSqlError
from qutebrowser.misc import sql
pytestmark = pytest.mark.usefixtures('init_sql') pytestmark = pytest.mark.usefixtures('init_sql')

5
tests/unit/utils/test_error.py
View File

@ -21,13 +21,12 @@
import logging import logging
import pytest import pytest
from PyQt5.QtCore import QTimer
from PyQt5.QtWidgets import QMessageBox
from qutebrowser.utils import error, utils from qutebrowser.utils import error, utils
from qutebrowser.misc import ipc from qutebrowser.misc import ipc
from PyQt5.QtCore import QTimer
from PyQt5.QtWidgets import QMessageBox
class Error(Exception): class Error(Exception):

3
tests/unit/utils/test_log.py
View File

@ -28,12 +28,11 @@ import warnings
import attr import attr
import pytest import pytest
import _pytest.logging import _pytest.logging
from PyQt5 import QtCore
from qutebrowser.utils import log from qutebrowser.utils import log
from qutebrowser.misc import utilcmds from qutebrowser.misc import utilcmds
from PyQt5 import QtCore
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def restore_loggers(): def restore_loggers():

4
tests/unit/utils/usertypes/test_neighborlist.py
View File

@ -19,10 +19,10 @@
"""Tests for the NeighborList class.""" """Tests for the NeighborList class."""
from qutebrowser.utils import usertypes
import pytest import pytest
from qutebrowser.utils import usertypes
class TestInit: class TestInit:

4
tests/unit/utils/usertypes/test_timer.py
View File

@ -19,11 +19,11 @@
"""Tests for Timer.""" """Tests for Timer."""
from qutebrowser.utils import usertypes
import pytest import pytest
from PyQt5.QtCore import QObject from PyQt5.QtCore import QObject
from qutebrowser.utils import usertypes
class Parent(QObject): class Parent(QObject):