diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-12-04 17:48:51 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-12-04 18:41:01 +0100 |
| commit | f5353970d375dd1dc5fa2e14cfaf43b28dfe500a (patch) | |
| tree | ca98849b2638734043abd35591e2b3273e3aac0e | |
| parent | 5b8f6c848092b042937c037d4d73ebe2bbe95743 (diff) | |
| download | qutebrowser-profile-cleanup-1.tar.gz qutebrowser-profile-cleanup-1.zip | |
webenginesettings: Move _init_settings()profile-cleanup-1
| -rw-r--r-- | qutebrowser/browser/webengine/webenginesettings.py | 13 | ||||
| -rw-r--r-- | qutebrowser/config/websettings.py | 1 | ||||
| -rw-r--r-- | tests/unit/browser/webengine/test_webenginesettings.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index 8b125dc22..05e7b4b68 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -47,7 +47,7 @@ default_profile = cast(QWebEngineProfile, None) # The QWebEngineProfile used for private (off-the-record) windows private_profile: Optional[QWebEngineProfile] = None # The global WebEngineSettings object -global_settings = cast('WebEngineSettings', None) +_global_settings = cast('WebEngineSettings', None) parsed_user_agent = None @@ -326,7 +326,7 @@ class ProfileSetter: def _update_settings(option): """Update global settings when qwebsettings changed.""" - global_settings.update_setting(option) + _global_settings.update_setting(option) default_profile.setter.update_setting(option) if private_profile: private_profile.setter.update_setting(option) @@ -360,6 +360,8 @@ def _init_profile(profile: QWebEngineProfile) -> None: history.web_history.url_cleared.connect( lambda url: profile.clearVisitedLinks([url])) + _global_settings.init_settings() + def _init_default_profile(): """Init the default QWebEngineProfile.""" @@ -482,14 +484,13 @@ def init(): from qutebrowser.misc import quitter quitter.instance.shutting_down.connect(_download_manager.shutdown) + global _global_settings + _global_settings = WebEngineSettings(_SettingsWrapper()) + _init_default_profile() init_private_profile() config.instance.changed.connect(_update_settings) - global global_settings - global_settings = WebEngineSettings(_SettingsWrapper()) - global_settings.init_settings() - _init_site_specific_quirks() _init_devtools_settings() diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py index 2b76ab9c5..e1cb393dc 100644 --- a/qutebrowser/config/websettings.py +++ b/qutebrowser/config/websettings.py @@ -247,7 +247,6 @@ def clear_private_data() -> None: if objects.backend == usertypes.Backend.QtWebEngine: from qutebrowser.browser.webengine import webenginesettings webenginesettings.init_private_profile() - webenginesettings.global_settings.init_settings() elif objects.backend == usertypes.Backend.QtWebKit: from qutebrowser.browser.webkit import cookies assert cookies.ram_cookie_jar is not None diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py index 2e667c199..92ac8aca6 100644 --- a/tests/unit/browser/webengine/test_webenginesettings.py +++ b/tests/unit/browser/webengine/test_webenginesettings.py @@ -32,7 +32,7 @@ def global_settings(monkeypatch, default_profile): wrapper = webenginesettings._SettingsWrapper() settings = webenginesettings.WebEngineSettings(wrapper) settings.init_settings() - monkeypatch.setattr(webenginesettings, 'global_settings', settings) + monkeypatch.setattr(webenginesettings, '_global_settings', settings) @pytest.fixture |