From 3b8537ff262339aa244fcabd97d43f8b2169feba Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 5 Sep 2016 18:20:48 +0200 Subject: [PATCH] Make webkitelem/mhtml imports optional in commands --- qutebrowser/browser/commands.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 1a6c2b718..283bec952 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -44,7 +44,13 @@ from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners from qutebrowser.config import config, configexc from qutebrowser.browser import (urlmarks, browsertab, inspector, navigate, webelem) -from qutebrowser.browser.webkit import webkitelem, downloads, mhtml +from qutebrowser.browser.webkit import downloads +try: + from qutebrowser.browser.webkit import webkitelem, mhtml +except ImportError: + # Failing imports on QtWebEngine, only used in QtWebKit commands. + # FIXME:qtwebengine don't import this anymore at all + pass from qutebrowser.keyinput import modeman from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils, objreg, utils, typing, javascript) @@ -1493,8 +1499,8 @@ class CommandDispatcher: """ try: elem.set_text(text, use_js=True) - except webkitelem.IsNullError: - raise cmdexc.CommandError("Element vanished while editing!") + except webelem.Error as e: + raise cmdexc.CommandError(str(e)) @cmdutils.register(instance='command-dispatcher', deprecated="Use :insert-text {primary}",