couple more conditional/noop import changes

No need to import webengine early in early init because we are doing
that in qt.py anyway.

Missed a conditional import in conftest that needed to change to a None
check.

Found by running the rewrite script again to see how idempotent it is.

2 files changed, 4 insertions, 22 deletions

diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index cc9726eb3..7df68bd0a 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -282,21 +282,6 @@ def check_optimize_flag():
                          "unexpected behavior may occur.")
 
 
-def webengine_early_import():
-    """If QtWebEngine is available, import it early.
-
-    We need to ensure that QtWebEngine is imported before a QApplication is created for
-    everything to work properly.
-
-    This needs to be done even when using the QtWebKit backend, to ensure that e.g.
-    error messages in backendproblem.py are accurate.
-    """
-    try:
-        from qutebrowser.qt import webenginewidgets  # pylint: disable=unused-import
-    except ImportError:
-        pass
-
-
 def early_init(args):
     """Do all needed early initialization.
 
@@ -321,4 +306,3 @@ def early_init(args):
     configure_pyqt()
     check_ssl_support()
     check_optimize_flag()
-    webengine_early_import()
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 8a4d56822..8f257eb46 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -38,7 +38,7 @@ from end2end.fixtures.quteprocess import (quteproc_process, quteproc,
 from end2end.fixtures.testprocess import pytest_runtest_makereport
 # pylint: enable=unused-import
 from qutebrowser.utils import qtutils, utils
-from qutebrowser.qt import core
+from qutebrowser.qt import webenginecore, core
 
 
 def pytest_configure(config):
@@ -118,13 +118,11 @@ def _get_version_tag(tag):
             reason='Needs ' + tag,
         )
     elif package == 'pyqtwebengine':
-        try:
-            from qutebrowser.qt.webenginecore import PYQT_WEBENGINE_VERSION
-        except ImportError:
+        if webenginecore:
+            running_version = webenginecore.PYQT_WEBENGINE_VERSION
+        else:
             # QtWebKit
             running_version = core.PYQT_VERSION
-        else:
-            running_version = PYQT_WEBENGINE_VERSION
         return pytest.mark.skipif(
             not _check_version(
                 op_str=match.group('operator'),