Neen't to move set_unknown_url_scheme_policy to websettings.py

2 files changed, 17 insertions, 18 deletions

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 41286dd0a..f06e71653 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -36,7 +36,7 @@ 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)
+                               urlmatch, usertypes)
 
 # The default QWebEngineProfile
 default_profile = typing.cast(QWebEngineProfile, None)
@@ -169,7 +169,7 @@ class WebEngineSettings(websettings.AbstractSettings):
                 QWebEngineSettings.AllowAllUnknownUrlSchemes,
         }
     except AttributeError:
-        pass
+        _UNKNOWN_URL_SCHEME_POLICY = None
 
     # Mapping from WebEngineSettings::initDefaults in
     # qtwebengine/src/core/web_engine_settings.cpp
@@ -182,6 +182,21 @@ class WebEngineSettings(websettings.AbstractSettings):
         QWebEngineSettings.FantasyFont: QFont.Fantasy,
     }
 
+    def set_unknown_url_scheme_policy(self, policy: str) -> bool:
+        """Set the UnknownUrlSchemePolicy to use.
+
+        Return:
+            True if there was a change, False otherwise.
+        """
+        old_value = self._settings.unknownUrlSchemePolicy()
+        if policy is usertypes.UNSET:  # type: ignore
+            self._settings.resetUnknownUrlSchemePolicy()
+            new_value = self._settings.unknownUrlSchemePolicy()
+        else:
+            new_value = self._UNKNOWN_URL_SCHEME_POLICY[policy]
+            self._settings.setUnknownUrlSchemePolicy(new_value)
+        return old_value != new_value
+
     def _update_setting(self, setting, value):
         if setting == 'content.unknown_url_scheme_policy':
             if self._UNKNOWN_URL_SCHEME_POLICY:
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index b95147155..03c85a71a 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -99,7 +99,6 @@ class AbstractSettings:
     _FONT_SIZES = {}  # type: typing.Dict[str, typing.Any]
     _FONT_FAMILIES = {}  # type: typing.Dict[str, typing.Any]
     _FONT_TO_QFONT = {}  # type: typing.Dict[typing.Any, QFont.StyleHint]
-    _UNKNOWN_URL_SCHEME_POLICY = {}  # type: typing.Dict[str, typing.Any]
 
     def __init__(self, settings: typing.Any) -> None:
         self._settings = settings
@@ -178,21 +177,6 @@ class AbstractSettings:
         self._settings.setDefaultTextEncoding(encoding)
         return old_value != encoding
 
-    def set_unknown_url_scheme_policy(self, policy: str) -> bool:
-        """Set the UnknownUrlSchemePolicy to use.
-
-        Return:
-            True if there was a change, False otherwise.
-        """
-        old_value = self._settings.unknownUrlSchemePolicy()
-        if policy is usertypes.UNSET:  # type: ignore
-            self._settings.resetUnknownUrlSchemePolicy()
-            new_value = self._settings.unknownUrlSchemePolicy()
-        else:
-            new_value = self._UNKNOWN_URL_SCHEME_POLICY[policy]
-            self._settings.setUnknownUrlSchemePolicy(new_value)
-        return old_value != new_value
-
     def _update_setting(self, setting: str, value: typing.Any) -> bool:
         """Update the given setting/value.