From 129ee33ffb823f2ce5c34bdb6f75403d9eda6c5f Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 13 Jun 2017 13:12:37 +0200 Subject: [PATCH] Refactor former network section --- qutebrowser/browser/network/proxy.py | 6 +++--- qutebrowser/browser/shared.py | 8 ++++---- qutebrowser/browser/webengine/interceptor.py | 2 +- qutebrowser/browser/webengine/webenginesettings.py | 3 +-- qutebrowser/browser/webkit/network/networkmanager.py | 4 ++-- qutebrowser/browser/webkit/webpage.py | 2 +- qutebrowser/commands/userscripts.py | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py index 037c9c712..2821a840d 100644 --- a/qutebrowser/browser/network/proxy.py +++ b/qutebrowser/browser/network/proxy.py @@ -44,7 +44,7 @@ class ProxyFactory(QNetworkProxyFactory): Return: None if proxy is correct, otherwise an error message. """ - proxy = config.val.network.proxy + proxy = config.val.content.proxy if isinstance(proxy, pac.PACFetcher): return proxy.fetch_error() else: @@ -59,7 +59,7 @@ class ProxyFactory(QNetworkProxyFactory): Return: A list of QNetworkProxy objects in order of preference. """ - proxy = config.val.network.proxy + proxy = config.val.content.proxy if proxy is configtypes.SYSTEM_PROXY: proxies = QNetworkProxyFactory.systemProxyForQuery(query) elif isinstance(proxy, pac.PACFetcher): @@ -69,7 +69,7 @@ class ProxyFactory(QNetworkProxyFactory): for p in proxies: if p.type() != QNetworkProxy.NoProxy: capabilities = p.capabilities() - if config.val.network.proxy_dns_requests: + if config.val.content.proxy_dns_requests: capabilities |= QNetworkProxy.HostNameLookupCapability else: capabilities &= ~QNetworkProxy.HostNameLookupCapability diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py index ab5080f55..4ddc22786 100644 --- a/qutebrowser/browser/shared.py +++ b/qutebrowser/browser/shared.py @@ -35,16 +35,16 @@ class CallSuper(Exception): def custom_headers(): """Get the combined custom headers.""" headers = {} - dnt = b'1' if config.val.network.do_not_track else b'0' + dnt = b'1' if config.val.content.do_not_track else b'0' headers[b'DNT'] = dnt headers[b'X-Do-Not-Track'] = dnt - config_headers = config.val.network.custom_headers + config_headers = config.val.content.custom_headers if config_headers is not None: for header, value in config_headers.items(): headers[header.encode('ascii')] = value.encode('ascii') - accept_language = config.val.network.accept_language + accept_language = config.val.content.accept_language if accept_language is not None: headers[b'Accept-Language'] = accept_language.encode('ascii') @@ -129,7 +129,7 @@ def ignore_certificate_errors(url, errors, abort_on): Return: True if the error should be ignored, False otherwise. """ - ssl_strict = config.val.network.ssl_strict + ssl_strict = config.val.content.ssl_strict log.webview.debug("Certificate errors {!r}, strict {}".format( errors, ssl_strict)) diff --git a/qutebrowser/browser/webengine/interceptor.py b/qutebrowser/browser/webengine/interceptor.py index 5d9dc8a70..71744f5d7 100644 --- a/qutebrowser/browser/webengine/interceptor.py +++ b/qutebrowser/browser/webengine/interceptor.py @@ -63,6 +63,6 @@ class RequestInterceptor(QWebEngineUrlRequestInterceptor): for header, value in shared.custom_headers(): info.setHttpHeader(header, value) - user_agent = config.val.network.user_agent + user_agent = config.val.conent.user_agent if user_agent is not None: info.setHttpHeader(b'User-Agent', user_agent.encode('ascii')) diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index 00f4ec423..7fc68f6fc 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -163,8 +163,7 @@ def _set_user_agent(profile): per-domain user agents), but this one still gets used for things like window.navigator.userAgent in JS. """ - user_agent = config.val.network.user_agent - profile.setHttpUserAgent(user_agent) + profile.setHttpUserAgent(config.val.content.user_agent) def update_settings(section, option): diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index c2ad03a6b..858dc2176 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -274,7 +274,7 @@ class NetworkManager(QNetworkAccessManager): # altogether. reply.netrc_used = True try: - net = netrc.netrc(config.val.network.netrc_file) + net = netrc.netrc(config.val.content.netrc_file) authenticators = net.authenticators(reply.url().host()) if authenticators is not None: (user, _account, password) = authenticators @@ -338,7 +338,7 @@ class NetworkManager(QNetworkAccessManager): def set_referer(self, req, current_url): """Set the referer header.""" - referer_header_conf = config.val.network.referer_header + referer_header_conf = config.val.content.referer_header try: if referer_header_conf == 'never': diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py index beb47ea09..ac156d12f 100644 --- a/qutebrowser/browser/webkit/webpage.py +++ b/qutebrowser/browser/webkit/webpage.py @@ -384,7 +384,7 @@ class BrowserPage(QWebPage): def userAgentForUrl(self, url): """Override QWebPage::userAgentForUrl to customize the user agent.""" - ua = config.val.network.user_agent + ua = config.val.content.user_agent if ua is None: return super().userAgentForUrl(url) else: diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py index 03d6bbffc..3e80946df 100644 --- a/qutebrowser/commands/userscripts.py +++ b/qutebrowser/commands/userscripts.py @@ -417,7 +417,7 @@ def run_async(tab, cmd, *args, win_id, env, verbose=False): lambda cmd: log.commands.debug("Got userscript command: {}".format(cmd))) runner.got_cmd.connect(commandrunner.run_safely) - user_agent = config.val.network.user_agent + user_agent = config.val.content.user_agent if user_agent is not None: env['QUTE_USER_AGENT'] = user_agent