From 8b7d21876f07db33bf8eefe0fa4539409176ef04 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 2 Sep 2016 16:27:28 +0200 Subject: [PATCH] Add debug logging to createWindow --- qutebrowser/browser/webengine/webview.py | 15 +++++++-------- qutebrowser/browser/webkit/webview.py | 4 +++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index 5c8d863e4..73a44c9ae 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -63,21 +63,20 @@ class WebEngineView(QWebEngineView): Return: The new QWebEngineView object. """ + debug_type = debug.qenum_key(QWebEnginePage, wintype) + log.webview.debug("createWindow with type {}".format(debug_type)) background = False - if wintype == QWebEnginePage.WebBrowserWindow: - log.webview.warning("WebBrowserWindow requested, but we don't " - "support that!") + if wintype in [QWebEnginePage.WebBrowserWindow, + QWebEnginePage.WebDialog]: + log.webview.warning("{} requested, but we don't support that!".format( + debug_type)) elif wintype == QWebEnginePage.WebBrowserTab: pass - elif wintype == QWebEnginePage.WebDialog: - log.webview.warning("WebDialog requested, but we don't support " - "that!") elif (hasattr(QWebEnginePage, 'WebBrowserBackgroundTab') and wintype == QWebEnginePage.WebBrowserBackgroundTab): background = True else: - raise ValueError("Invalid wintype {}".format(debug.qenum_key( - QWebEnginePage, wintype))) + raise ValueError("Invalid wintype {}".format(debug_type)) tabbed_browser = objreg.get('tabbed-browser', scope='window', window=self._win_id) diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py index 52e75ad14..f9d22c9d6 100644 --- a/qutebrowser/browser/webkit/webview.py +++ b/qutebrowser/browser/webkit/webview.py @@ -29,7 +29,7 @@ from PyQt5.QtWebKitWidgets import QWebView, QWebPage, QWebFrame from qutebrowser.config import config from qutebrowser.keyinput import modeman -from qutebrowser.utils import log, usertypes, utils, qtutils, objreg +from qutebrowser.utils import log, usertypes, utils, qtutils, objreg, debug from qutebrowser.browser.webkit import webpage, webkitelem @@ -218,6 +218,8 @@ class WebView(QWebView): Return: The new QWebView object. """ + debug_type = debug.qenum_key(QWebPage, wintype) + log.webview.debug("createWindow with type {}".format(debug_type)) if wintype == QWebPage.WebModalDialog: log.webview.warning("WebModalDialog requested, but we don't " "support that!")