Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserView.py	Sun Jul 29 14:04:22 2018 +0200
+++ b/WebBrowser/WebBrowserView.py	Sun Jul 29 17:26:12 2018 +0200
@@ -2220,68 +2220,69 @@
     ## Methods below implement slots for Qt 5.11+
     ###########################################################################
     
-    @pyqtSlot("QWebEngineQuotaRequest")
-    def __quotaRequested(self, quotaRequest):
-        """
-        Private slot to handle quota requests of the web page.
-        
-        @param quotaRequest reference to the quota request object
-        @type QWebEngineQuotaRequest
-        """
-        acceptRequest = Preferences.getWebBrowser("AcceptQuotaRequest")
-        # yes/no/ask (0, 1, 2)
-        if acceptRequest == 0:
-            # always yes
-            ok = True
-        elif acceptRequest == 1:
-            # always no
-            ok = False
-        else:
-            # ask user
-            from .Download.DownloadUtilities import dataString
-            sizeStr = dataString(quotaRequest.requestedSize())
+    if qVersionTuple() >= (5, 11, 0):
+        @pyqtSlot("QWebEngineQuotaRequest")
+        def __quotaRequested(self, quotaRequest):
+            """
+            Private slot to handle quota requests of the web page.
             
-            ok = E5MessageBox.yesNo(
-                self,
-                self.tr("Quota Request"),
-                self.tr("""<p> Allow the website at <b>{0}</b> to use"""
-                        """ <b>{1}</b> of persistent storage?</p>""")
-                .format(quotaRequest.origin().host(), sizeStr)
-            )
+            @param quotaRequest reference to the quota request object
+            @type QWebEngineQuotaRequest
+            """
+            acceptRequest = Preferences.getWebBrowser("AcceptQuotaRequest")
+            # yes/no/ask (0, 1, 2)
+            if acceptRequest == 0:
+                # always yes
+                ok = True
+            elif acceptRequest == 1:
+                # always no
+                ok = False
+            else:
+                # ask user
+                from .Download.DownloadUtilities import dataString
+                sizeStr = dataString(quotaRequest.requestedSize())
+                
+                ok = E5MessageBox.yesNo(
+                    self,
+                    self.tr("Quota Request"),
+                    self.tr("""<p> Allow the website at <b>{0}</b> to use"""
+                            """ <b>{1}</b> of persistent storage?</p>""")
+                    .format(quotaRequest.origin().host(), sizeStr)
+                )
+            
+            if ok:
+                quotaRequest.accept()
+            else:
+                quotaRequest.reject()
         
-        if ok:
-            quotaRequest.accept()
-        else:
-            quotaRequest.reject()
-    
-    @pyqtSlot("QWebEngineRegisterProtocolHandlerRequest")
-    def __registerProtocolHandlerRequested(self, request):
-        """
-        Private slot to handle requests for registration of a protocol handler.
-        
-        @param request reference to the protocol handler request object
-        @type QWebEngineRegisterProtocolHandlerRequest
-        """
-        acceptRequest = Preferences.getWebBrowser(
-            "AcceptProtocolHandlerRequest")
-        # yes/no/ask (0, 1, 2)
-        if acceptRequest == 0:
-            # always yes
-            ok = True
-        elif acceptRequest == 1:
-            # always no
-            ok = False
-        else:
-            # ask user
-            ok = E5MessageBox.yesNo(
-                self,
-                self.tr("Protocol Handler Request"),
-                self.tr("""<p> Allow the website at <b>{0}</b> to open all"""
-                        """ <b>{1}</b> links?</p>""")
-                .format(request.origin().host(), request.scheme())
-            )
-        
-        if ok:
-            request.accept()
-        else:
-            request.reject()
+        @pyqtSlot("QWebEngineRegisterProtocolHandlerRequest")
+        def __registerProtocolHandlerRequested(self, request):
+            """
+            Private slot to handle requests for registration of a protocol handler.
+            
+            @param request reference to the protocol handler request object
+            @type QWebEngineRegisterProtocolHandlerRequest
+            """
+            acceptRequest = Preferences.getWebBrowser(
+                "AcceptProtocolHandlerRequest")
+            # yes/no/ask (0, 1, 2)
+            if acceptRequest == 0:
+                # always yes
+                ok = True
+            elif acceptRequest == 1:
+                # always no
+                ok = False
+            else:
+                # ask user
+                ok = E5MessageBox.yesNo(
+                    self,
+                    self.tr("Protocol Handler Request"),
+                    self.tr("""<p> Allow the website at <b>{0}</b> to open all"""
+                            """ <b>{1}</b> links?</p>""")
+                    .format(request.origin().host(), request.scheme())
+                )
+            
+            if ok:
+                request.accept()
+            else:
+                request.reject()