Mercurial Repositories > eric / changeset

--- a/eric7/EricNetwork/EricTldExtractor.py	Mon Aug 30 20:02:39 2021 +0200
+++ b/eric7/EricNetwork/EricTldExtractor.py	Tue Aug 31 17:31:23 2021 +0200
@@ -320,7 +320,8 @@
         
         file = QFile(dataFile)
         
-        if not file.open(QIODevice.OpenModeFlag.ReadOnly | QIODevice.OpenModeFlag.Text):
+        if not file.open(QIODevice.OpenModeFlag.ReadOnly |
+                         QIODevice.OpenModeFlag.Text):
             return False
         
         seekToEndOfPrivateDomains = False
@@ -479,7 +480,8 @@
         
         file = QFile(testDataFileName)
         
-        if not file.open(QIODevice.OpenModeFlag.ReadOnly | QIODevice.OpenModeFlag.Text):
+        if not file.open(QIODevice.OpenModeFlag.ReadOnly |
+                         QIODevice.OpenModeFlag.Text):
             return False
         
         testRegExp = re.compile(

--- a/eric7/WebBrowser/AdBlock/AdBlockRule.py	Mon Aug 30 20:02:39 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockRule.py	Tue Aug 31 17:31:23 2021 +0200
@@ -13,6 +13,8 @@
 from PyQt6.QtCore import Qt
 from PyQt6.QtWebEngineCore import QWebEngineUrlRequestInfo
 
+from EricNetwork import EricTldExtractor
+
 
 def toSecondLevelDomain(url):
     """
@@ -23,7 +25,7 @@
     @return name of second level domain
     @rtype str
     """
-    topLevelDomain = url.topLevelDomain()
+    topLevelDomain = EricTldExtractor.instance().tld(url.host())
     urlHost = url.host()
     
     if not topLevelDomain or not urlHost: