summaryrefslogtreecommitdiff
path: root/qutebrowser/utils
diff options
context:
space:
mode:
authorAnder Punnar <ander@kvlt.ee>2021-04-13 22:27:53 +0300
committerAnder Punnar <ander@kvlt.ee>2021-04-13 22:27:53 +0300
commit0fe9520042f6ad46fbc55a3b92793c85c13e5b7c (patch)
tree50e21a055bdba4a7e5aca8b93007f62f5c012c15 /qutebrowser/utils
parent26b84e1c9502d4178c0d0dbcf07a8f8eca8606cb (diff)
parentdacaefaf38bd854d95b4ee10f4c5d563bbcb7240 (diff)
downloadqutebrowser-0fe9520042f6ad46fbc55a3b92793c85c13e5b7c.tar.gz
qutebrowser-0fe9520042f6ad46fbc55a3b92793c85c13e5b7c.zip
Merge remote-tracking branch 'origin/master' into 4nd3r/hostblock_subdomains
Diffstat (limited to 'qutebrowser/utils')
-rw-r--r--qutebrowser/utils/version.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index d1fcc8e32..2bac125ed 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -34,7 +34,8 @@ import datetime
import getpass
import functools
import dataclasses
-from typing import Mapping, Optional, Sequence, Tuple, ClassVar, Dict, cast
+from typing import (Mapping, Optional, Sequence, Tuple, ClassVar, Dict, cast,
+ TYPE_CHECKING)
from PyQt5.QtCore import PYQT_VERSION_STR, QLibraryInfo, qVersion
@@ -58,7 +59,9 @@ import qutebrowser
from qutebrowser.utils import log, utils, standarddir, usertypes, message, resources
from qutebrowser.misc import objects, earlyinit, sql, httpclient, pastebin, elf
from qutebrowser.browser import pdfjs
-from qutebrowser.config import config, websettings
+from qutebrowser.config import config
+if TYPE_CHECKING:
+ from qutebrowser.config import websettings
_LOGO = r'''
______ ,,
@@ -594,7 +597,7 @@ class WebEngineVersions:
return s
@classmethod
- def from_ua(cls, ua: websettings.UserAgent) -> 'WebEngineVersions':
+ def from_ua(cls, ua: 'websettings.UserAgent') -> 'WebEngineVersions':
"""Get the versions parsed from a user agent.
This is the most reliable and "default" way to get this information (at least