diff -r cf988a30ba47 -r 76daafe10009 eric6/WebBrowser/WebInspector.py
--- a/eric6/WebBrowser/WebInspector.py Sat Jan 02 17:28:57 2021 +0100
+++ b/eric6/WebBrowser/WebInspector.py Sun Jan 03 15:33:39 2021 +0100
@@ -7,17 +7,11 @@
Module implementing a QWebEngineView to load the web inspector in.
"""
-import json
-import os
-
-from PyQt5.QtCore import pyqtSignal, QSize, QUrl
-from PyQt5.QtNetwork import QNetworkRequest
+from PyQt5.QtCore import pyqtSignal, QSize
from PyQt5.QtWebEngineWidgets import (
QWebEngineView, QWebEnginePage, QWebEngineSettings
)
-from Globals import qVersionTuple
-
import Preferences
_VIEWS = []
@@ -90,48 +84,7 @@
self.__inspectElement = inspectElement
- try:
- self.page().setInspectedPage(self.__view.page())
- except AttributeError:
- # pre Qt 5.11
- port = Preferences.getWebBrowser("WebInspectorPort")
- inspectorUrl = QUrl("http://localhost:{0}".format(port))
-
- from WebBrowser.WebBrowserWindow import WebBrowserWindow
- self.__reply = WebBrowserWindow.networkManager().get(
- QNetworkRequest(inspectorUrl.resolved(QUrl("json/list"))))
- self.__reply.finished.connect(self.__inspectorReplyFinished)
-
- def __inspectorReplyFinished(self):
- """
- Private slot handling the reply.
- """
- # used for pre Qt 5.11
- result = str(self.__reply.readAll(), encoding="utf8")
-
- self.__reply.deleteLater()
- self.__reply = None
-
- pageUrl = QUrl()
- try:
- index = _VIEWS.index(self.__view)
- except ValueError:
- index = -1
- try:
- clients = json.loads(result)
- if len(clients) > index:
- port = Preferences.getWebBrowser("WebInspectorPort")
- inspectorUrl = QUrl("http://localhost:{0}".format(port))
-
- client = clients[index]
- pageUrl = inspectorUrl.resolved(
- QUrl(client["devtoolsFrontendUrl"]))
- self.load(pageUrl)
- pushView(self)
- self.show()
- except json.JSONDecodeError:
- # ignore silently
- pass
+ self.page().setInspectedPage(self.__view.page())
def inspectElement(self):
"""
@@ -147,19 +100,12 @@
@return flag indicating the enabled state
@rtype bool
"""
- if qVersionTuple() < (5, 11, 0):
- if not os.getenv("QTWEBENGINE_REMOTE_DEBUGGING"):
- return False
-
from WebBrowser.WebBrowserWindow import WebBrowserWindow
if not WebBrowserWindow.webSettings().testAttribute(
QWebEngineSettings.JavascriptEnabled):
return False
- if qVersionTuple() < (5, 11, 0):
- return Preferences.getWebBrowser("WebInspectorEnabled")
- else:
- return True
+ return True
def __loadFinished(self):
"""
