From 9e258a490e505ab1917bcb669883b0929e5943e3 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Fri, 19 Jan 2018 06:59:40 -0500 Subject: [PATCH] might as well use the same loop prevention mechanism for both backends --- qutebrowser/browser/webengine/webenginetab.py | 2 +- qutebrowser/browser/webkit/network/networkmanager.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index a50d8e2a3..cf7dc2d98 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -741,7 +741,7 @@ class WebEngineTab(browsertab.AbstractTab): @pyqtSlot(QUrl, 'QAuthenticator*') def _on_authentication_required(self, url, authenticator): netrc = None - if not self.data.netrc_used and 'HOME' in os.environ: + if not self.data.netrc_used: self.data.netrc_used = True netrc = shared.netrc_authentication(url, authenticator) if not netrc: diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index 5e9d6f991..d41bfbd90 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -269,8 +269,8 @@ class NetworkManager(QNetworkAccessManager): def on_authentication_required(self, reply, authenticator): """Called when a website needs authentication.""" netrc = False - if not hasattr(reply, "netrc_used"): - setattr(reply, "netrc_used", True) + if not self.data.netrc_used: + self.data.netrc_used = True netrc = shared.netrc_authentication(reply.url(), authenticator) if not netrc: abort_on = self._get_abort_signals(reply)