eric: comparison eric6/WebBrowser/WebBrowserView.py

-:fb0ef164f536
+:698ae46f40a4
 Module implementing the web browser using QWebEngineView.
 """
 import os
 import functools
+import contextlib
 from PyQt5.QtCore import (
 pyqtSignal, pyqtSlot, Qt, QUrl, QFileInfo, QTimer, QEvent, QPoint,
 QPointF, QDateTime, QStandardPaths, QByteArray, QIODevice, QDataStream
 )
 @param mainWindow reference to the main window (WebBrowserWindow)
 @param parent parent widget of this window (QWidget)
 @param name name of this window (string)
 """
-super(WebBrowserView, self).__init__(parent)
+super().__init__(parent)
 self.setObjectName(name)
 self.__rwhvqt = None
 self.installEventFilter(self)
 self.setPage(self.__page)
 self.__page.safeBrowsingAbort.connect(self.safeBrowsingAbort)
 self.__page.safeBrowsingBad.connect(self.safeBrowsingBad)
 self.__page.printPageRequested.connect(self.__printPage)
-try:
+self.__page.quotaRequested.connect(self.__quotaRequested)
-self.__page.quotaRequested.connect(self.__quotaRequested)
+# The registerProtocolHandlerRequested signal is handled in
-# The registerProtocolHandlerRequested signal is handled in
+# WebBrowserPage.
-# WebBrowserPage.
+self.__page.selectClientCertificate.connect(
-except AttributeError:
+self.__selectClientCertificate)
-# pre Qt 5.11
+with contextlib.suppress(AttributeError, ImportError):
-pass
+#- Qt >= 5.14
-try:
-self.__page.selectClientCertificate.connect(
-self.__selectClientCertificate)
-except AttributeError:
-# pre Qt 5.12
-pass
-try:
 from PyQt5.QtWebEngineCore import QWebEngineFindTextResult
 # __IGNORE_WARNING__
 self.__page.findTextFinished.connect(
 self.__findTextFinished)
-except (AttributeError, ImportError):
-# pre Qt 5.14
-pass
 def __setRwhvqt(self):
 """
 Private slot to set widget that receives input events.
 """
 not self.__page.acceptNavigationRequest(
 url, QWebEnginePage.NavigationType.NavigationTypeTyped, True)
 ):
 return
-super(WebBrowserView, self).load(url)
+super().load(url)
 if not self.__firstLoad:
 self.__firstLoad = True
 WebInspector.pushView(self)
 if not searchText:
 return
 engineName = act.data()
-if engineName:
+engine = (
-engine = self.__mw.openSearchManager().engine(engineName)
+self.__mw.openSearchManager().engine(engineName)
-else:
+if engineName else
-engine = self.__mw.openSearchManager().currentEngine()
+self.__mw.openSearchManager().currentEngine()
+)
 if engine:
 self.search.emit(engine.searchUrl(searchText))
 def __addSearchEngine(self):
 """
 url = QUrl(evt.mimeData().text())
 if url.isValid():
 evt.acceptProposedAction()
 if not evt.isAccepted():
-super(WebBrowserView, self).dragMoveEvent(evt)
+super().dragMoveEvent(evt)
 def dropEvent(self, evt):
 """
 Protected method called by a drop event.
 @param evt reference to the drop event (QDropEvent)
 """
-super(WebBrowserView, self).dropEvent(evt)
+super().dropEvent(evt)
 if (
 not evt.isAccepted() and
 evt.source() != self and
 evt.possibleActions() & Qt.DropAction.CopyAction
 ):
 """
 Protected method called by a key release.
 @param evt reference to the key event (QKeyEvent)
 """
-if evt.key() == Qt.Key.Key_Escape:
+if evt.key() == Qt.Key.Key_Escape and self.isFullScreen():
-if self.isFullScreen():
+self.triggerPageAction(QWebEnginePage.WebAction.ExitFullScreen)
-self.triggerPageAction(QWebEnginePage.WebAction.ExitFullScreen)
+evt.accept()
-evt.accept()
+self.requestFullScreen(False)
-self.requestFullScreen(False)
 def _gestureEvent(self, evt):
 """
 Protected method handling gesture events.
 QEvent.Type.MouseMove,
 QEvent.Type.Wheel,
 QEvent.Type.Gesture]:
 return True
-elif evt.type() == QEvent.Type.Hide:
+elif evt.type() == QEvent.Type.Hide and self.isFullScreen():
-if self.isFullScreen():
+self.triggerPageAction(QWebEnginePage.WebAction.ExitFullScreen)
-self.triggerPageAction(
-QWebEnginePage.WebAction.ExitFullScreen)
+return super().eventFilter(obj, evt)
-return super(WebBrowserView, self).eventFilter(obj, evt)
 def event(self, evt):
 """
 Public method handling events.
 """
 if evt.type() == QEvent.Type.Gesture:
 self._gestureEvent(evt)
 return True
-return super(WebBrowserView, self).event(evt)
+return super().event(evt)
 def inputWidget(self):
 """
 Public method to get a reference to the render widget.
 self.__siteIcon = QIcon()
 if self.__siteIconLoader is not None:
 self.__siteIconLoader.deleteLater()
 self.__siteIconLoader = WebIconLoader(url, self)
 self.__siteIconLoader.iconLoaded.connect(self.__iconLoaded)
-try:
+with contextlib.suppress(AttributeError):
 self.__siteIconLoader.sslConfiguration.connect(
 self.page().setSslConfiguration)
 self.__siteIconLoader.clearSslConfiguration.connect(
 self.page().clearSslConfiguration)
-except AttributeError:
-# no SSL available
-pass
 def __iconLoaded(self, icon):
 """
 Private slot handling the loaded web site icon.
 Public method to get the view title.
 @return view title
 @rtype str
 """
-titleStr = super(WebBrowserView, self).title()
+titleStr = super().title()
 if not titleStr:
 if self.url().isEmpty():
 url = self.__page.requestedUrl()
 else:
 url = self.url()
 Protected method to handle show events.
 @param evt reference to the show event object
 @type QShowEvent
 """
-super(WebBrowserView, self).showEvent(evt)
+super().showEvent(evt)
 self.activateSession()
 def activateSession(self):
 """
 Public slot to activate a restored session.
 generated by getSessionData()
 @type dict
 @return tuple containing the title, URL and web icon
 @rtype tuple of (str, str, QIcon)
 """
-if "Title" in sessionData:
+title = sessionData.get("Title", "")
-title = sessionData["Title"]
+urlStr = sessionData.get("Url", "")
-else:
-title = ""
-if "Url" in sessionData:
-urlStr = sessionData["Url"]
-else:
-urlStr = ""
 if "Icon" in sessionData:
 iconArray = QByteArray.fromBase64(
 sessionData["Icon"].encode("ascii"))
 stream = QDataStream(iconArray, QIODevice.OpenModeFlag.ReadOnly)

Mercurial Repositories > eric / file comparison

comparison: eric6/WebBrowser/WebBrowserView.py

eric6/WebBrowser/WebBrowserView.py