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

Remove _view attribute in BrowserPage.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-24 20:50:14 +02:00
parent 6a5c9ba138
commit aa5e1922ef
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/browser/webpage.py
View File

@ -40,7 +40,6 @@ class BrowserPage(QWebPage):
Attributes: Attributes:
_extension_handlers: Mapping of QWebPage extensions to their handlers. _extension_handlers: Mapping of QWebPage extensions to their handlers.
_view: The QWebView associated with this page.
_networkmnager: The NetworkManager used. _networkmnager: The NetworkManager used.
Signals: Signals:
@ -51,8 +50,8 @@ class BrowserPage(QWebPage):
start_download = pyqtSignal('QNetworkReply*') start_download = pyqtSignal('QNetworkReply*')
change_title = pyqtSignal(str) change_title = pyqtSignal(str)
def __init__(self, view): def __init__(self, parent=None):
super().__init__(view) super().__init__(parent)
self._extension_handlers = { self._extension_handlers = {
QWebPage.ErrorPageExtension: self._handle_errorpage, QWebPage.ErrorPageExtension: self._handle_errorpage,
QWebPage.ChooseMultipleFilesExtension: self._handle_multiple_files, QWebPage.ChooseMultipleFilesExtension: self._handle_multiple_files,
@ -63,7 +62,6 @@ class BrowserPage(QWebPage):
self.printRequested.connect(self.on_print_requested) self.printRequested.connect(self.on_print_requested)
self.downloadRequested.connect(self.on_download_requested) self.downloadRequested.connect(self.on_download_requested)
self.unsupportedContent.connect(self.on_unsupported_content) self.unsupportedContent.connect(self.on_unsupported_content)
self._view = view
if PYQT_VERSION > 0x050300: if PYQT_VERSION > 0x050300:
# WORKAROUND (remove this when we bump the requirements to 5.3.1) # WORKAROUND (remove this when we bump the requirements to 5.3.1)
@ -300,10 +298,10 @@ class BrowserPage(QWebPage):
message.error("Invalid link {} clicked!".format(urlstr)) message.error("Invalid link {} clicked!".format(urlstr))
log.webview.debug(url.errorString()) log.webview.debug(url.errorString())
return False return False
if self._view.open_target == usertypes.ClickTarget.tab: if self.view().open_target == usertypes.ClickTarget.tab:
objreg.get('tabbed-browser').tabopen(url, False) objreg.get('tabbed-browser').tabopen(url, False)
return False return False
elif self._view.open_target == usertypes.ClickTarget.tab_bg: elif self.view().open_target == usertypes.ClickTarget.tab_bg:
objreg.get('tabbed-browser').tabopen(url, True) objreg.get('tabbed-browser').tabopen(url, True)
return False return False
else: else: