rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use a temporary attribute of the class to prevent the loop; tested to work in both backends

Browse Source
This commit is contained in:
Marc Jauvin 2018-01-19 09:34:45 -05:00
parent 9e258a490e
commit 4a4a6549d0
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qutebrowser/browser/browsertab.py
View File

@ -99,7 +99,6 @@ class TabData:
Only used for QtWebKit. Only used for QtWebKit.
pinned: Flag to pin the tab. pinned: Flag to pin the tab.
fullscreen: Whether the tab has a video shown fullscreen currently. fullscreen: Whether the tab has a video shown fullscreen currently.
netrc_used: flag to avoid endless loop when using netrc
""" """
keep_icon = attr.ib(False) keep_icon = attr.ib(False)
@ -108,7 +107,6 @@ class TabData:
override_target = attr.ib(None) override_target = attr.ib(None)
pinned = attr.ib(False) pinned = attr.ib(False)
fullscreen = attr.ib(False) fullscreen = attr.ib(False)
netrc_used = False
class AbstractAction: class AbstractAction:
@ -726,7 +724,12 @@ class AbstractTab(QWidget):
self._progress = 0 self._progress = 0
self._has_ssl_errors = False self._has_ssl_errors = False
self.data.viewing_source = False self.data.viewing_source = False
self.data.netrc_used = False if self.backend == usertypes.Backend.QtWebKit:
obj = self.networkaccessmanager()
else:
obj = self
if hasattr(obj, 'netrc_used'):
delattr(obj, 'netrc_used')
self._set_load_status(usertypes.LoadStatus.loading) self._set_load_status(usertypes.LoadStatus.loading)
self.load_started.emit() self.load_started.emit()

5
qutebrowser/browser/webengine/webenginetab.py
View File

@ -19,7 +19,6 @@
"""Wrapper over a QWebEngineView.""" """Wrapper over a QWebEngineView."""
import os
import math import math
import functools import functools
import html as html_utils import html as html_utils
@ -741,8 +740,8 @@ class WebEngineTab(browsertab.AbstractTab):
@pyqtSlot(QUrl, 'QAuthenticator*') @pyqtSlot(QUrl, 'QAuthenticator*')
def _on_authentication_required(self, url, authenticator): def _on_authentication_required(self, url, authenticator):
netrc = None netrc = None
if not self.data.netrc_used: if not hasattr(self, 'netrc_used'):
self.data.netrc_used = True setattr(self, 'netrc_used', True)
netrc = shared.netrc_authentication(url, authenticator) netrc = shared.netrc_authentication(url, authenticator)
if not netrc: if not netrc:
abort_on = [self.shutting_down, self.load_started] abort_on = [self.shutting_down, self.load_started]

4
qutebrowser/browser/webkit/network/networkmanager.py
View File

@ -269,8 +269,8 @@ class NetworkManager(QNetworkAccessManager):
def on_authentication_required(self, reply, authenticator): def on_authentication_required(self, reply, authenticator):
"""Called when a website needs authentication.""" """Called when a website needs authentication."""
netrc = False netrc = False
if not self.data.netrc_used: if not hasattr(self, 'netrc_used'):
self.data.netrc_used = True setattr(self, 'netrc_used', True)
netrc = shared.netrc_authentication(reply.url(), authenticator) netrc = shared.netrc_authentication(reply.url(), authenticator)
if not netrc: if not netrc:
abort_on = self._get_abort_signals(reply) abort_on = self._get_abort_signals(reply)