PR: Remove deprecated QWebKit code

spyder_terminal/tests/test_terminal.py

@@ -18,7 +18,6 @@
 from qtpy.QtWebEngineWidgets import WEBENGINE
 from qtpy.QtWidgets import QMainWindow
 
-
 os.environ['SPYDER_DEV'] = 'True'
 
 # Local imports
@@ -46,17 +45,14 @@
 
 def check_pwd(termwidget):
     """Check if pwd command is executed."""
-    if WEBENGINE:
-        def callback(data):
-            global html
-            html = data
-        termwidget.body.runJavaScript(PREFIX + "getTerminalLines()", callback)
-        try:
-            return LOCATION in html
-        except NameError:
-            return False
-    else:
-        return LOCATION in termwidget.body.toHtml()
+    def callback(data):
+        global html
+        html = data
+    termwidget.body.runJavaScript(PREFIX + "getTerminalLines()", callback)
+    try:
+        return LOCATION in html
+    except NameError:
+        return False
 
 
 def check_increase_font_size(term):
@@ -85,37 +81,29 @@ def callback(data):
 
 def check_fonts(term, expected):
     """Check if terminal fonts were updated."""
-    if WEBENGINE:
-        def callback(data):
-            global term_fonts
-            term_fonts = data
-        term.body.runJavaScript(PREFIX + "getFonts()", callback)
-        try:
-            return term_fonts == expected
-        except NameError:
-            return False
-    else:
-        fonts = term.get_fonts()
-        fonts = fonts.replace("'", '"')
-        return fonts == expected
+    def callback(data):
+        global term_fonts
+        term_fonts = data
+    term.body.runJavaScript(PREFIX + "getFonts()", callback)
+    try:
+        return term_fonts == expected
+    except NameError:
+        return False
 
 
 def check_hex_to_rgb(term):
     """Check if terminal is converting hexa colors to rgb correctly."""
-    if WEBENGINE:
-        def callback(data):
-            global hex_to_rgb
-            hex_to_rgb = data
-        expected = 'rgba(170, 171, 33, 0.2)'
-        color = '#aaab21'
-        term.body.runJavaScript(PREFIX + "hexToRGB('{}')".format(color),
-                                callback)
-        try:
-            return hex_to_rgb == expected
-        except NameError:
-            return False
-    else:
-        return True
+    def callback(data):
+        global hex_to_rgb
+        hex_to_rgb = data
+    expected = 'rgba(170, 171, 33, 0.2)'
+    color = '#aaab21'
+    term.body.runJavaScript(PREFIX + "hexToRGB('{}')".format(color),
+                            callback)
+    try:
+        return hex_to_rgb == expected
+    except NameError:
+        return False
 
 
 def check_num_tabs(terminal, ref_value):

spyder_terminal/widgets/terminalgui.py

@@ -13,8 +13,8 @@
 from qtpy.QtCore import (Qt, QUrl, Slot, QEvent, QTimer, Signal,
                          QObject)
 from qtpy.QtGui import QKeySequence
-from qtpy.QtWebEngineWidgets import (QWebEnginePage, QWebEngineSettings,
-                                     WEBENGINE)
+from qtpy.QtWebChannel import QWebChannel
+from qtpy.QtWebEngineWidgets import QWebEnginePage, QWebEngineSettings
 from qtpy.QtWidgets import QMenu, QFrame, QVBoxLayout, QWidget
 from spyder.config.base import DEV, get_translation
 from spyder.config.manager import CONF
@@ -27,8 +27,6 @@
 from spyder_terminal.widgets.style.themes import ANSI_COLORS
 from spyder_terminal.config import CONF_SECTION
 
-if WEBENGINE:
-    from qtpy.QtWebChannel import QWebChannel
 
 PREFIX = 'spyder_terminal.default.'
 
@@ -88,8 +86,6 @@ def __init__(self, parent, port, path='~', font=None, theme=None,
         self.body = self.view.document
 
         self.handler.sig_ready.connect(self.setup_term)
-        if not WEBENGINE:
-            QTimer.singleShot(250, self.__alive_loopback)
 
     def setup_term(self):
         """Setup other terminal options after page has loaded."""
@@ -222,21 +218,18 @@ def __init__(self, parent, CONF, term_url='http://127.0.0.1:8070',
         self.parent = parent
         self.CONF = CONF
         self.shortcuts = self.create_shortcuts()
-        if WEBENGINE:
-            self.channel = QWebChannel(self.page())
-            self.page().setWebChannel(self.channel)
-            self.channel.registerObject('handler', handler)
+        self.channel = QWebChannel(self.page())
+        self.page().setWebChannel(self.channel)
+        self.channel.registerObject('handler', handler)
+
         self.term_url = QUrl(term_url)
         self.load(self.term_url)
 
-        if WEBENGINE:
-            self.document = self.page()
-            try:
-                self.document.profile().clearHttpCache()
-            except AttributeError:
-                pass
-        else:
-            self.document = self.page().mainFrame()
+        self.document = self.page()
+        try:
+            self.document.profile().clearHttpCache()
+        except AttributeError:
+            pass
 
         self.initial_y_pos = 0
         self.setFocusPolicy(Qt.ClickFocus)
@@ -326,11 +319,6 @@ def contextMenuEvent(self, event):
         actions = [self.pageAction(QWebEnginePage.SelectAll),
                    copy_action, paste_action, clear_action, None, zoom_in,
                    zoom_out]
-        if DEV and not WEBENGINE:
-            settings = self.page().settings()
-            settings.setAttribute(QWebEngineSettings.DeveloperExtrasEnabled,
-                                  True)
-            actions += [None, self.pageAction(QWebEnginePage.InspectElement)]
         add_actions(menu, actions)
         menu.popup(event.globalPos())
         event.accept()
@@ -340,11 +328,7 @@ def eval_javascript(self, script):
         Evaluate Javascript instructions inside DOM with the expected prefix.
         """
         script = PREFIX + script
-        if WEBENGINE:
-            self.document.runJavaScript("{}".format(script),
-                                        self.return_js_value)
-        else:
-            self.document.evaluateJavaScript("{}".format(script))
+        self.document.runJavaScript("{}".format(script), self.return_js_value)
 
     def return_js_value(self, value):
         """Return the value of the function evaluated in Javascript."""