old qt: Remove unused imports

qutebrowser/browser/eventfilter.py

@@ -22,7 +22,7 @@
 from PyQt5.QtCore import QObject, QEvent, Qt, QTimer
 
 from qutebrowser.config import config
-from qutebrowser.utils import message, log, usertypes, qtutils, objreg
+from qutebrowser.utils import message, log, usertypes, qtutils
 from qutebrowser.misc import objects
 from qutebrowser.keyinput import modeman
 

qutebrowser/browser/greasemonkey.py

@@ -32,8 +32,7 @@ import attr
 from PyQt5.QtCore import pyqtSignal, QObject, QUrl
 
 from qutebrowser.utils import (log, standarddir, jinja, objreg, utils,
-                               javascript, urlmatch, version, usertypes,
-                               qtutils)
+                               javascript, urlmatch, version, usertypes)
 from qutebrowser.api import cmdutils
 from qutebrowser.browser import downloads
 from qutebrowser.misc import objects

qutebrowser/browser/pdfjs.py

@@ -24,9 +24,7 @@ import os
 
 from PyQt5.QtCore import QUrl, QUrlQuery
 
-from qutebrowser.utils import (utils, javascript, jinja, qtutils, usertypes,
-                               standarddir, log)
-from qutebrowser.misc import objects
+from qutebrowser.utils import utils, javascript, jinja, standarddir, log
 from qutebrowser.config import config
 
 

qutebrowser/browser/qutescheme.py

@@ -34,7 +34,7 @@ import collections
 import secrets
 from typing import TypeVar, Callable, Dict, List, Optional, Union, Sequence, Tuple
 
-from PyQt5.QtCore import QUrlQuery, QUrl, qVersion
+from PyQt5.QtCore import QUrlQuery, QUrl
 
 import qutebrowser
 from qutebrowser.browser import pdfjs, downloads, history

qutebrowser/browser/shared.py

@@ -27,8 +27,7 @@ from typing import Callable, Mapping
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.config import config
-from qutebrowser.utils import (usertypes, message, log, objreg, jinja, utils,
-                               qtutils)
+from qutebrowser.utils import usertypes, message, log, objreg, jinja, utils
 from qutebrowser.mainwindow import mainwindow
 
 

qutebrowser/browser/webengine/cookies.py

@@ -20,7 +20,7 @@
 """Filter for QtWebEngine cookies."""
 
 from qutebrowser.config import config
-from qutebrowser.utils import utils, qtutils, log
+from qutebrowser.utils import utils, log
 from qutebrowser.misc import objects
 
 

qutebrowser/browser/webengine/spell.py

@@ -24,10 +24,8 @@ import glob
 import os
 import os.path
 import re
-import shutil
 
-from PyQt5.QtCore import QLibraryInfo
-from qutebrowser.utils import log, message, standarddir, qtutils
+from qutebrowser.utils import log, message, standarddir
 
 _DICT_VERSION_RE = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
 

qutebrowser/browser/webengine/webenginedownloads.py

@@ -21,14 +21,13 @@
 
 import re
 import os.path
-import urllib
 import functools
 
 from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QObject
 from PyQt5.QtWebEngineWidgets import QWebEngineDownloadItem
 
 from qutebrowser.browser import downloads, pdfjs
-from qutebrowser.utils import debug, usertypes, message, log, qtutils, objreg
+from qutebrowser.utils import debug, usertypes, message, log, objreg
 
 
 class DownloadItem(downloads.AbstractDownloadItem):

qutebrowser/browser/webengine/webengineinspector.py

@@ -19,17 +19,16 @@
 
 """Customized QWebInspector for QtWebEngine."""
 
-import os
 import pathlib
 
-from PyQt5.QtCore import QUrl, QLibraryInfo
+from PyQt5.QtCore import QLibraryInfo
 from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage
 from PyQt5.QtWidgets import QWidget
 
 from qutebrowser.browser import inspector
 from qutebrowser.browser.webengine import webenginesettings
 from qutebrowser.misc import miscwidgets
-from qutebrowser.utils import version, qtutils
+from qutebrowser.utils import version
 
 
 class WebEngineInspectorView(QWebEngineView):

qutebrowser/browser/webengine/webenginesettings.py

@@ -29,14 +29,12 @@ import operator
 from typing import cast, Any, List, Optional, Tuple, Union
 
 from PyQt5.QtGui import QFont
-from PyQt5.QtWebEngineWidgets import (QWebEngineSettings, QWebEngineProfile,
-                                      QWebEnginePage)
+from PyQt5.QtWebEngineWidgets import QWebEngineSettings, QWebEngineProfile
 
 from qutebrowser.browser.webengine import spell, webenginequtescheme
 from qutebrowser.config import config, websettings
 from qutebrowser.config.websettings import AttributeInfo as Attr
-from qutebrowser.utils import (utils, standarddir, qtutils, message, log,
-                               urlmatch, usertypes)
+from qutebrowser.utils import standarddir, qtutils, message, log, urlmatch, usertypes
 
 # The default QWebEngineProfile
 default_profile = cast(QWebEngineProfile, None)

qutebrowser/browser/webengine/webenginetab.py

@@ -23,15 +23,14 @@ import math
 import functools
 import re
 import html as html_utils
-from typing import cast, Optional, Union
+from typing import cast, Union
 
-from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QPoint, QPointF, QUrl,
-                          QTimer, QObject)
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QPointF, QUrl, QObject
 from PyQt5.QtNetwork import QAuthenticator
 from PyQt5.QtWidgets import QApplication, QWidget
 from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript, QWebEngineHistory
 
-from qutebrowser.config import configdata, config
+from qutebrowser.config import config
 from qutebrowser.browser import (browsertab, eventfilter, shared, webelem,
                                  history, greasemonkey)
 from qutebrowser.browser.webengine import (webview, webengineelem, tabhistory,

qutebrowser/browser/webengine/webview.py

@@ -19,19 +19,15 @@
 
 """The main browser widget for QtWebEngine."""
 
-from typing import Optional
 
-from PyQt5.QtCore import pyqtSignal, QUrl, PYQT_VERSION
+from PyQt5.QtCore import pyqtSignal, QUrl
 from PyQt5.QtGui import QPalette
-from PyQt5.QtWidgets import QWidget
 from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage
 
 from qutebrowser.browser import shared
 from qutebrowser.browser.webengine import webenginesettings, certificateerror
 from qutebrowser.config import config
-from qutebrowser.utils import log, debug, usertypes, qtutils
-from qutebrowser.misc import miscwidgets, objects
-from qutebrowser.qt import sip
+from qutebrowser.utils import log, debug, usertypes
 
 
 class WebEngineView(QWebEngineView):

qutebrowser/browser/webkit/cache.py

@@ -25,7 +25,7 @@ import os.path
 from PyQt5.QtNetwork import QNetworkDiskCache
 
 from qutebrowser.config import config
-from qutebrowser.utils import utils, qtutils, standarddir
+from qutebrowser.utils import utils, standarddir
 
 
 diskcache = cast('DiskCache', None)

qutebrowser/config/websettings.py

@@ -22,7 +22,7 @@
 import re
 import argparse
 import functools
-from typing import Any, Callable, Dict, Optional, Set
+from typing import Any, Callable, Dict, Optional
 
 import attr
 from PyQt5.QtCore import QUrl, pyqtSlot, qVersion
@@ -30,7 +30,7 @@ from PyQt5.QtGui import QFont
 
 import qutebrowser
 from qutebrowser.config import config
-from qutebrowser.utils import log, usertypes, urlmatch, qtutils, utils
+from qutebrowser.utils import usertypes, urlmatch, qtutils, utils
 from qutebrowser.misc import objects, debugcachestats
 
 UNSET = object()

qutebrowser/misc/earlyinit.py

@@ -173,7 +173,6 @@ def check_qt_version():
     from PyQt5.QtCore import (qVersion, QT_VERSION, PYQT_VERSION,
                               PYQT_VERSION_STR)
     from pkg_resources import parse_version
-    from qutebrowser.utils import log
     parsed_qversion = parse_version(qVersion())
 
     if (QT_VERSION < 0x050C00 or PYQT_VERSION < 0x050C00 or

qutebrowser/utils/utils.py

@@ -31,7 +31,6 @@ import traceback
 import functools
 import contextlib
 import posixpath
-import socket
 import shlex
 import glob
 import mimetypes

scripts/dictcli.py

@@ -37,8 +37,7 @@ import attr
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir))
 from qutebrowser.browser.webengine import spell
 from qutebrowser.config import configdata
-from qutebrowser.utils import standarddir, utils
-from scripts import utils as scriptutils
+from qutebrowser.utils import standarddir
 
 
 API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/master/'

tests/end2end/features/test_prompts_bdd.py

@@ -22,8 +22,6 @@ import logging
 import pytest_bdd as bdd
 bdd.scenarios('prompts.feature')
 
-from qutebrowser.utils import qtutils
-
 
 @bdd.when("I load an SSL page")
 def load_ssl_page(quteproc, ssl_server):

tests/end2end/fixtures/quteprocess.py

@@ -36,7 +36,7 @@ import pytest
 from PyQt5.QtCore import pyqtSignal, QUrl
 
 from qutebrowser.misc import ipc
-from qutebrowser.utils import log, utils, javascript, qtutils
+from qutebrowser.utils import log, utils, javascript
 from helpers import utils as testutils
 from end2end.fixtures import testprocess
 

tests/end2end/test_invocations.py

@@ -20,7 +20,6 @@
 """Test starting qutebrowser with special arguments/environments."""
 
 import subprocess
-import socket
 import sys
 import logging
 import re
@@ -29,7 +28,6 @@ import pytest
 from PyQt5.QtCore import QProcess
 
 from helpers import utils
-from qutebrowser.utils import qtutils
 
 
 ascii_locale = pytest.mark.skipif(sys.hexversion >= 0x03070000,

tests/helpers/fixtures.py

@@ -45,7 +45,7 @@ import helpers.stubs as stubsmod
 from qutebrowser.config import (config, configdata, configtypes, configexc,
                                 configfiles, configcache, stylesheet)
 from qutebrowser.api import config as configapi
-from qutebrowser.utils import objreg, standarddir, utils, usertypes, qtutils
+from qutebrowser.utils import objreg, standarddir, utils, usertypes
 from qutebrowser.browser import greasemonkey, history, qutescheme
 from qutebrowser.browser.webkit import cookies, cache
 from qutebrowser.misc import savemanager, sql, objects, sessions

tests/unit/browser/test_pdfjs.py

@@ -24,7 +24,7 @@ import pytest
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.browser import pdfjs
-from qutebrowser.utils import usertypes, utils, urlmatch
+from qutebrowser.utils import urlmatch
 
 
 pytestmark = [pytest.mark.usefixtures('data_tmpdir')]

tests/unit/browser/webengine/test_spell.py

@@ -22,10 +22,9 @@ import logging
 import os
 
 import pytest
-from PyQt5.QtCore import QLibraryInfo
 
 from qutebrowser.browser.webengine import spell
-from qutebrowser.utils import usertypes, qtutils, standarddir
+from qutebrowser.utils import usertypes
 
 
 def test_version(message_mock, caplog):

tests/unit/browser/webengine/test_webenginedownloads.py

@@ -24,7 +24,6 @@ import pytest
 pytest.importorskip('PyQt5.QtWebEngineWidgets')
 
 from qutebrowser.browser.webengine import webenginedownloads
-from helpers import utils
 
 
 @pytest.mark.parametrize('path, expected', [

tests/unit/browser/webengine/test_webengineinterceptor.py

@@ -27,8 +27,6 @@ pytest.importorskip('PyQt5.QtWebEngineWidgets')
 from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInfo
 
 from qutebrowser.browser.webengine import interceptor
-from qutebrowser.extensions import interceptors
-from qutebrowser.utils import qtutils
 
 
 def test_no_missing_resource_types():

tests/unit/browser/webengine/test_webenginesettings.py

@@ -24,7 +24,7 @@ import pytest
 pytest.importorskip('PyQt5.QtWebEngineWidgets')
 
 from qutebrowser.browser.webengine import webenginesettings
-from qutebrowser.utils import usertypes, qtutils
+from qutebrowser.utils import usertypes
 from qutebrowser.misc import objects
 
 

tests/unit/browser/webkit/test_cache.py

@@ -23,7 +23,6 @@ from PyQt5.QtCore import QUrl, QDateTime
 from PyQt5.QtNetwork import QNetworkDiskCache, QNetworkCacheMetaData
 
 from qutebrowser.browser.webkit import cache
-from qutebrowser.utils import qtutils
 
 
 @pytest.fixture

tests/unit/mainwindow/statusbar/test_url.py

@@ -26,7 +26,6 @@ from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import usertypes, urlutils
 from qutebrowser.mainwindow.statusbar import url
-from helpers import utils
 
 
 @pytest.fixture

tests/unit/utils/test_urlutils.py

@@ -33,7 +33,6 @@ import hypothesis.strategies
 from qutebrowser.api import cmdutils
 from qutebrowser.browser.network import pac
 from qutebrowser.utils import utils, urlutils, usertypes
-from helpers import utils as testutils
 
 
 class FakeDNS:

tests/unit/utils/test_utils.py

@@ -25,7 +25,6 @@ import os.path
 import io
 import logging
 import functools
-import socket
 import re
 import shlex
 import math