--- a/eric6/WebBrowser/WebBrowserPage.py Wed Sep 25 19:00:09 2019 +0200 +++ b/eric6/WebBrowser/WebBrowserPage.py Wed Sep 25 19:11:13 2019 +0200 @@ -8,11 +8,13 @@ Module implementing the helpbrowser using QWebView. """ -from PyQt5.QtCore import pyqtSlot, pyqtSignal, QUrl, QUrlQuery, QTimer, \ - QEventLoop, QPoint, QPointF +from PyQt5.QtCore import ( + pyqtSlot, pyqtSignal, QUrl, QUrlQuery, QTimer, QEventLoop, QPoint, QPointF +) from PyQt5.QtGui import QDesktopServices -from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineSettings, \ - QWebEngineScript +from PyQt5.QtWebEngineWidgets import ( + QWebEnginePage, QWebEngineSettings, QWebEngineScript +) from PyQt5.QtWebChannel import QWebChannel from E5Gui import E5MessageBox @@ -122,8 +124,10 @@ return False # GreaseMonkey - if type_ == QWebEnginePage.NavigationTypeLinkClicked and \ - url.toString().endswith(".user.js"): + if ( + type_ == QWebEnginePage.NavigationTypeLinkClicked and + url.toString().endswith(".user.js") + ): WebBrowserWindow.greaseMonkeyManager().downloadScript(url) return False @@ -139,16 +143,21 @@ # Safe Browsing self.__badSite = False - from WebBrowser.SafeBrowsing.SafeBrowsingManager import \ + from WebBrowser.SafeBrowsing.SafeBrowsingManager import ( SafeBrowsingManager - if SafeBrowsingManager.isEnabled() and \ - url.scheme() not in \ - SafeBrowsingManager.getIgnoreSchemes(): - threatLists = \ + ) + if ( + SafeBrowsingManager.isEnabled() and + url.scheme() not in SafeBrowsingManager.getIgnoreSchemes() + ): + threatLists = ( WebBrowserWindow.safeBrowsingManager().lookupUrl(url)[0] + ) if threatLists: - threatMessages = WebBrowserWindow.safeBrowsingManager()\ + threatMessages = ( + WebBrowserWindow.safeBrowsingManager() .getThreatMessages(threatLists) + ) res = E5MessageBox.warning( WebBrowserWindow.getWindow(), self.tr("Suspicuous URL detected"), @@ -164,8 +173,10 @@ return False self.__badSite = True - threatType = WebBrowserWindow.safeBrowsingManager()\ + threatType = ( + WebBrowserWindow.safeBrowsingManager() .getThreatType(threatLists[0]) + ) self.safeBrowsingBad.emit(threatType, "".join(threatMessages)) result = QWebEnginePage.acceptNavigationRequest(self, url, type_, @@ -198,8 +209,11 @@ @param url new URL @type QUrl """ - if not url.isEmpty() and url.scheme() == "eric" and \ - not self.isJavaScriptEnabled(): + if ( + not url.isEmpty() and + url.scheme() == "eric" and + not self.isJavaScriptEnabled() + ): self.settings().setAttribute(QWebEngineSettings.JavascriptEnabled, True) self.triggerAction(QWebEnginePage.Reload) @@ -544,14 +558,16 @@ @param request reference to the registration request @type QWebEngineRegisterProtocolHandlerRequest """ - from PyQt5.QtWebEngineCore import \ + from PyQt5.QtWebEngineCore import ( QWebEngineRegisterProtocolHandlerRequest + ) if self.__registerProtocolHandlerRequest: del self.__registerProtocolHandlerRequest self.__registerProtocolHandlerRequest = None - self.__registerProtocolHandlerRequest = \ + self.__registerProtocolHandlerRequest = ( QWebEngineRegisterProtocolHandlerRequest(request) + ) except TypeError: # this is supported with Qt 5.12 and later pass @@ -563,9 +579,11 @@ @return registered protocol handler request URL @rtype QUrl """ - if self.__registerProtocolHandlerRequest and \ + if ( + self.__registerProtocolHandlerRequest and (self.url().host() == - self.__registerProtocolHandlerRequest.origin().host()): + self.__registerProtocolHandlerRequest.origin().host()) + ): return self.__registerProtocolHandlerRequest.origin() else: return QUrl() @@ -577,9 +595,11 @@ @return registered protocol handler request scheme @rtype str """ - if self.__registerProtocolHandlerRequest and \ + if ( + self.__registerProtocolHandlerRequest and (self.url().host() == - self.__registerProtocolHandlerRequest.origin().host()): + self.__registerProtocolHandlerRequest.origin().host()) + ): return self.__registerProtocolHandlerRequest.scheme() else: return ""