diff -r 304fcefd3b04 -r e3d7a861547c Helpviewer/AdBlock/AdBlockSubscription.py --- a/Helpviewer/AdBlock/AdBlockSubscription.py Sun Feb 10 15:26:21 2013 +0100 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Sun Feb 10 18:31:31 2013 +0100 @@ -18,11 +18,6 @@ from E5Gui import E5MessageBox -from .AdBlockRule import AdBlockRule - -import Helpviewer.HelpWindow -from Helpviewer.Network.FollowRedirectReply import FollowRedirectReply - import Utilities import Preferences @@ -127,6 +122,7 @@ self.__requiresTitle = \ QUrl.fromPercentEncoding(url.encodedQueryItemValue("requiresTitle")) if self.__requiresLocation and self.__requiresTitle: + import Helpviewer.HelpWindow Helpviewer.HelpWindow.HelpWindow.adBlockManager().loadRequiredSubscription( self.__requiresLocation, self.__requiresTitle) @@ -283,6 +279,8 @@ f.remove() self.__lastUpdate = QDateTime() else: + from .AdBlockRule import AdBlockRule + self.__updatePeriod = 0 self.__remoteModified = QDateTime() self.__rules = [] @@ -346,6 +344,8 @@ self.__loadRules() return + import Helpviewer.HelpWindow + from Helpviewer.Network.FollowRedirectReply import FollowRedirectReply self.__downloading = FollowRedirectReply(self.location(), Helpviewer.HelpWindow.HelpWindow.networkAccessManager()) self.__downloading.finished[()].connect(self.__rulesDownloaded) @@ -656,6 +656,7 @@ rule = self.__rules[offset] rule.setEnabled(enabled) if rule.isCSSRule(): + import Helpviewer.HelpWindow self.__populateCache() Helpviewer.HelpWindow.HelpWindow.mainWindow().reloadUserStyleSheet()