Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/AdBlock/AdBlockRule.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/AdBlock/AdBlockRule.py	Tue Mar 02 17:17:09 2021 +0100
@@ -100,7 +100,7 @@
         self.__isEnabled = True
         self.__isException = False
         self.__isInternalDisabled = False
-        self.__caseSensitivity = Qt.CaseInsensitive
+        self.__caseSensitivity = Qt.CaseSensitivity.CaseInsensitive
         
         self.__type = AdBlockRuleType.StringContainsMatchRule
         self.__options = AdBlockRuleOption.NoOption
@@ -195,7 +195,7 @@
                     self.__parseDomains(option[7:], "|")
                     handledOptions += 1
                 elif option == "match-case":
-                    self.__caseSensitivity = Qt.CaseSensitive
+                    self.__caseSensitivity = Qt.CaseSensitivity.CaseSensitive
                     handledOptions += 1
                 elif option.endswith("third-party"):
                     self.setOption(AdBlockRuleOption.ThirdPartyOption)
@@ -491,14 +491,14 @@
         matched = False
         
         if self.__type == AdBlockRuleType.StringContainsMatchRule:
-            if self.__caseSensitivity == Qt.CaseInsensitive:
+            if self.__caseSensitivity == Qt.CaseSensitivity.CaseInsensitive:
                 matched = self.__matchString.lower() in encodedUrl.lower()
             else:
                 matched = self.__matchString in encodedUrl
         elif self.__type == AdBlockRuleType.DomainMatchRule:
             matched = self.__isMatchingDomain(domain, self.__matchString)
         elif self.__type == AdBlockRuleType.StringEndsMatchRule:
-            if self.__caseSensitivity == Qt.CaseInsensitive:
+            if self.__caseSensitivity == Qt.CaseSensitivity.CaseInsensitive:
                 matched = encodedUrl.lower().endswith(
                     self.__matchString.lower())
             else:
@@ -577,7 +577,8 @@
         @rtype bool
         """
         match = (
-            req.resourceType() == QWebEngineUrlRequestInfo.ResourceTypeObject)
+            req.resourceType() ==
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeObject)
         
         if self.__hasException(AdBlockRuleOption.ObjectOption):
             return not match
@@ -595,7 +596,7 @@
         """
         match = (
             req.resourceType() ==
-            QWebEngineUrlRequestInfo.ResourceTypeSubFrame)
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeSubFrame)
         
         if self.__hasException(AdBlockRuleOption.SubdocumentOption):
             return not match
@@ -612,7 +613,8 @@
         @rtype bool
         """
         match = (
-            req.resourceType() == QWebEngineUrlRequestInfo.ResourceTypeXhr)
+            req.resourceType() ==
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeXhr)
         
         if self.__hasException(AdBlockRuleOption.XMLHttpRequestOption):
             return not match
@@ -629,7 +631,8 @@
         @rtype bool
         """
         match = (
-            req.resourceType() == QWebEngineUrlRequestInfo.ResourceTypeImage)
+            req.resourceType() ==
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeImage)
         
         if self.__hasException(AdBlockRuleOption.ImageOption):
             return not match
@@ -646,7 +649,8 @@
         @rtype bool
         """
         match = (
-            req.resourceType() == QWebEngineUrlRequestInfo.ResourceTypeScript)
+            req.resourceType() ==
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeScript)
         
         if self.__hasException(AdBlockRuleOption.ScriptOption):
             return not match
@@ -664,7 +668,7 @@
         """
         match = (
             req.resourceType() ==
-            QWebEngineUrlRequestInfo.ResourceTypeStylesheet)
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeStylesheet)
         
         if self.__hasException(AdBlockRuleOption.StyleSheetOption):
             return not match
@@ -682,11 +686,11 @@
         """
         match = (
             req.resourceType() ==
-            QWebEngineUrlRequestInfo.ResourceTypeSubResource
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeSubResource
         )
         match = match or (
             req.resourceType() ==
-            QWebEngineUrlRequestInfo.ResourceTypePluginResource
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypePluginResource
         )
         
         if self.__objectSubrequestException:
@@ -704,7 +708,8 @@
         @rtype bool
         """
         match = (
-            req.resourceType() == QWebEngineUrlRequestInfo.ResourceTypePing)
+            req.resourceType() ==
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypePing)
         
         if self.__hasException(AdBlockRuleOption.PingOption):
             return not match
@@ -721,7 +726,8 @@
         @rtype bool
         """
         match = (
-            req.resourceType() == QWebEngineUrlRequestInfo.ResourceTypeMedia)
+            req.resourceType() ==
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeMedia)
         
         if self.__hasException(AdBlockRuleOption.MediaOption):
             return not match
@@ -739,7 +745,7 @@
         """
         match = (
             req.resourceType() ==
-            QWebEngineUrlRequestInfo.ResourceTypeFontResource)
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeFontResource)
         
         if self.__hasException(AdBlockRuleOption.FontOption):
             return not match
@@ -756,13 +762,13 @@
         @rtype bool
         """
         match = req.resourceType() in [
-            QWebEngineUrlRequestInfo.ResourceTypeSubResource,
-            QWebEngineUrlRequestInfo.ResourceTypeWorker,
-            QWebEngineUrlRequestInfo.ResourceTypeSharedWorker,
-            QWebEngineUrlRequestInfo.ResourceTypeServiceWorker,
-            QWebEngineUrlRequestInfo.ResourceTypePrefetch,
-            QWebEngineUrlRequestInfo.ResourceTypeFavicon,
-            QWebEngineUrlRequestInfo.ResourceTypeUnknown,
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeSubResource,
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeWorker,
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeSharedWorker,
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeServiceWorker,
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypePrefetch,
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeFavicon,
+            QWebEngineUrlRequestInfo.ResourceType.ResourceTypeUnknown,
         ]
         
         if self.__hasException(AdBlockRuleOption.OtherOption):