summaryrefslogtreecommitdiff
path: root/qutebrowser
diff options
context:
space:
mode:
authorLembrun <amadeusk7@free.fr>2021-03-07 18:50:08 +0100
committerLembrun <amadeusk7@free.fr>2021-03-07 18:50:08 +0100
commit8130c0316a737ddea1624351fa60b1812d0d2015 (patch)
tree11dabd4452c7ab94bded47e28a0d17f110d5ef05 /qutebrowser
parentff83241c81a6574106c70642b7de4824ccc1e9be (diff)
downloadqutebrowser-8130c0316a737ddea1624351fa60b1812d0d2015.tar.gz
qutebrowser-8130c0316a737ddea1624351fa60b1812d0d2015.zip
Fixed linting
Diffstat (limited to 'qutebrowser')
-rw-r--r--qutebrowser/browser/webkit/webkittab.py2
-rw-r--r--qutebrowser/utils/utils.py17
2 files changed, 6 insertions, 13 deletions
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index a1d3e5574..df3491ec2 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -33,7 +33,7 @@ from PyQt5.QtPrintSupport import QPrinter
from qutebrowser.browser import browsertab, shared
from qutebrowser.browser.webkit import (webview, tabhistory, webkitelem,
- webkitsettings)
+ webkitsettings, webkitinspector)
from qutebrowser.utils import qtutils, usertypes, utils, log, debug, resources
from qutebrowser.keyinput import modeman
from qutebrowser.qt import sip
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 93bf17ff5..a2c935ff0 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -30,14 +30,13 @@ import datetime
import traceback
import functools
import contextlib
-import posixpath
import shlex
import mimetypes
-import pathlib
import ctypes
import ctypes.util
-from typing import (Any, Callable, IO, Iterator, Optional, Sequence, Tuple, Type, Union,
- Iterable, TypeVar, TYPE_CHECKING)
+from typing import (Any, Callable, IO, Iterator,
+ Optional, Sequence, Tuple, Type, Union,
+ TypeVar, TYPE_CHECKING)
try:
# Protocol was added in Python 3.8
from typing import Protocol
@@ -50,11 +49,7 @@ except ImportError: # pragma: no cover
from PyQt5.QtCore import QUrl, QVersionNumber, QRect
from PyQt5.QtGui import QClipboard, QDesktopServices
from PyQt5.QtWidgets import QApplication
-# We cannot use the stdlib version on 3.7-3.8 because we need the files() API.
-if sys.version_info >= (3, 9):
- import importlib.resources as importlib_resources
-else: # pragma: no cover
- import importlib_resources
+
import yaml
try:
from yaml import (CSafeLoader as YamlLoader,
@@ -65,13 +60,10 @@ except ImportError: # pragma: no cover
SafeDumper as YamlDumper)
YAML_C_EXT = False
-import qutebrowser
from qutebrowser.utils import log
-
fake_clipboard = None
log_clipboard = False
-_resource_cache = {}
is_mac = sys.platform.startswith('darwin')
is_linux = sys.platform.startswith('linux')
@@ -195,6 +187,7 @@ def compact_text(text: str, elidelength: int = None) -> str:
out = elide(out, elidelength)
return out
+
def parse_version(version: str) -> VersionNumber:
"""Parse a version string."""
ver, _suffix = QVersionNumber.fromString(version)