Merge branch 'qutebrowser:master' into master

misc/requirements/requirements-dev.txt

@@ -5,7 +5,7 @@ build==0.7.0
 bump2version==1.0.1
 certifi==2021.10.8
 cffi==1.15.0
-charset-normalizer==2.0.8
+charset-normalizer==2.0.9
 colorama==0.4.4
 cryptography==36.0.0
 Deprecated==1.2.13

misc/requirements/requirements-mypy.txt

@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 chardet==4.0.0
-diff-cover==6.4.3
+diff-cover==6.4.4
 importlib-metadata==4.8.2
 importlib-resources==5.4.0
 Jinja2==3.0.3

misc/requirements/requirements-pylint.txt

@@ -3,7 +3,7 @@
 astroid==2.9.0
 certifi==2021.10.8
 cffi==1.15.0
-charset-normalizer==2.0.8
+charset-normalizer==2.0.9
 cryptography==36.0.0
 Deprecated==1.2.13
 future==0.18.2
@@ -16,13 +16,13 @@ mccabe==0.6.1
 pefile==2021.9.3
 platformdirs==2.4.0
 pycparser==2.21
-pylint==2.12.1
+pylint==2.12.2
 python-dateutil==2.8.2
 ./scripts/dev/pylint_checkers
 requests==2.26.0
 six==1.16.0
 toml==0.10.2
-typed-ast==1.5.0 ; python_version<"3.8"
+typed-ast==1.5.1 ; python_version<"3.8"
 typing_extensions==4.0.1
 uritemplate==4.1.1
 # urllib3==1.26.7

misc/requirements/requirements-pyroma.txt

@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 certifi==2021.10.8
-charset-normalizer==2.0.8
+charset-normalizer==2.0.9
 docutils==0.18.1
 idna==3.3
 Pygments==2.10.0

misc/requirements/requirements-sphinx.txt

@@ -3,7 +3,7 @@
 alabaster==0.7.12
 Babel==2.9.1
 certifi==2021.10.8
-charset-normalizer==2.0.8
+charset-normalizer==2.0.9
 docutils==0.17.1
 idna==3.3
 imagesize==1.3.0

misc/requirements/requirements-tests.txt

@@ -3,7 +3,7 @@
 attrs==21.2.0
 beautifulsoup4==4.10.0
 certifi==2021.10.8
-charset-normalizer==2.0.8
+charset-normalizer==2.0.9
 cheroot==8.5.2
 click==8.0.3
 coverage==6.2
@@ -13,7 +13,7 @@ filelock==3.4.0
 Flask==2.0.2
 glob2==0.7
 hunter==3.3.8
-hypothesis==6.30.0
+hypothesis==6.30.1
 icdiff==2.0.4
 idna==3.3
 iniconfig==1.1.1

misc/requirements/requirements-tox.txt

@@ -9,7 +9,7 @@ platformdirs==2.4.0
 pluggy==1.0.0
 py==1.11.0
 pyparsing==3.0.6
-setuptools==59.4.0
+setuptools==59.5.0
 six==1.16.0
 toml==0.10.2
 tox==3.24.4

qutebrowser/config/config.py

@@ -195,7 +195,7 @@ class KeyConfig:
 
         See #5942.
         """
-        cmd_to_keys: "KeyConfig._ReverseBindings" = {}
+        cmd_to_keys: KeyConfig._ReverseBindings = {}
         bindings = self.get_bindings_for(mode)
         for seq, full_cmd in sorted(bindings.items()):
             for cmdtext in full_cmd.split(';;'):

qutebrowser/config/configfiles.py

@@ -70,7 +70,7 @@ class VersionChange(enum.Enum):
         This is intended to use filters like "major" (show major only), "minor" (show
         major/minor) or "patch" (show all changes).
         """
-        allowed_values: Dict[str, List["VersionChange"]] = {
+        allowed_values: Dict[str, List[VersionChange]] = {
             'major': [VersionChange.major],
             'minor': [VersionChange.major, VersionChange.minor],
             'patch': [VersionChange.major, VersionChange.minor, VersionChange.patch],

qutebrowser/config/configutils.py

@@ -92,7 +92,7 @@ class Values:
                  values: Sequence[ScopedValue] = ()) -> None:
         self.opt = opt
         self._vmap: MutableMapping[
-            "Values._VmapKeyType", ScopedValue] = collections.OrderedDict()
+            Values._VmapKeyType, ScopedValue] = collections.OrderedDict()
         # A map from domain parts to rules that fall under them.
         self._domain_map: Dict[
             Optional[str], Set[ScopedValue]] = collections.defaultdict(set)

qutebrowser/keyinput/basekeyparser.py

@@ -75,7 +75,7 @@ class BindingTrie:
     __slots__ = 'children', 'command'
 
     def __init__(self) -> None:
-        self.children: MutableMapping[keyutils.KeyInfo, "BindingTrie"] = {}
+        self.children: MutableMapping[keyutils.KeyInfo, BindingTrie] = {}
         self.command: Optional[str] = None
 
     def __setitem__(self, sequence: keyutils.KeySequence,

requirements.txt

@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-adblock==0.5.0
+adblock==0.5.1
 colorama==0.4.4
 dataclasses==0.6 ; python_version<"3.7"
 importlib-metadata==4.8.2 ; python_version<"3.8"

tests/unit/config/test_configfiles.py

@@ -873,7 +873,7 @@ class TestConfigPyModules:
         confpy.read()
         expected = {'normal': {',a': 'message-info foo'}}
         assert config.instance.get_obj('bindings.commands') == expected
-        assert "qbmodule" not in sys.modules.keys()
+        assert "qbmodule" not in sys.modules
         assert tmp_path not in sys.path
 
     def test_restore_sys_on_err(self, confpy, qbmodulepy, tmp_path):
@@ -884,7 +884,7 @@ class TestConfigPyModules:
 
         assert error.text == "Unhandled exception"
         assert isinstance(error.exception, ZeroDivisionError)
-        assert "qbmodule" not in sys.modules.keys()
+        assert "qbmodule" not in sys.modules
         assert tmp_path not in sys.path
 
     def test_fail_on_nonexistent_module(self, confpy, qbmodulepy, tmp_path):