diff -r 0b936ff1bbb9 -r a2bc06a54d9d src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py
--- a/src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py Sun Nov 06 11:22:39 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py Mon Nov 07 17:19:58 2022 +0100
@@ -28,6 +28,7 @@
from eric7 import Preferences, Utilities
from eric7.EricWidgets import EricMessageBox
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
class AdBlockSubscription(QObject):
@@ -137,8 +138,6 @@
QByteArray(urlQuery.queryItemValue("requiresTitle").encode())
)
if self.__requiresLocation and self.__requiresTitle:
- from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
WebBrowserWindow.adBlockManager().loadRequiredSubscription(
self.__requiresLocation, self.__requiresTitle
)
@@ -292,6 +291,8 @@
"""
Private method to load the rules of the subscription.
"""
+ from .AdBlockRule import AdBlockRule
+
fileName = self.rulesFileName()
if os.path.exists(fileName):
try:
@@ -310,8 +311,6 @@
os.unlink(fileName)
self.__lastUpdate = QDateTime()
else:
- from .AdBlockRule import AdBlockRule
-
self.__updatePeriod = 0
self.__remoteModified = QDateTime()
self.__rules = []
@@ -405,8 +404,6 @@
self.__loadRules()
return
- from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
reply = WebBrowserWindow.networkManager().get(QNetworkRequest(self.location()))
reply.finished.connect(lambda: self.__rulesDownloaded(reply))
self.__downloading = reply
@@ -449,8 +446,6 @@
fileName = self.rulesFileName()
try:
with open(fileName, "wb") as f:
- from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
if (
WebBrowserWindow.adBlockManager().useLimitedEasyList()
and self.url()
@@ -672,8 +667,6 @@
self.rulesEnabledChanged.emit()
if rule.isCSSRule():
- from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
WebBrowserWindow.mainWindow().reloadUserStyleSheet()
return rule
