diff -r 26aa6fd94dc2 -r 9e6da33c1c10 Helpviewer/AdBlock/AdBlockSubscription.py
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Sun Jul 22 15:32:52 2012 +0200
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py Mon Jul 23 19:21:44 2012 +0200
@@ -11,13 +11,14 @@
from PyQt4.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, QUrl, \
QCryptographicHash, QFile, QIODevice, QTextStream
-from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt4.QtNetwork import QNetworkReply
from E5Gui import E5MessageBox
from .AdBlockRule import AdBlockRule
import Helpviewer.HelpWindow
+from Helpviewer.Network.FollowRedirectReply import FollowRedirectReply
import Utilities
import Preferences
@@ -256,9 +257,8 @@
self.changed.emit()
return
- request = QNetworkRequest(self.location())
- self.__downloading = \
- Helpviewer.HelpWindow.HelpWindow.networkAccessManager().get(request)
+ self.__downloading = FollowRedirectReply(self.location(),
+ Helpviewer.HelpWindow.HelpWindow.networkAccessManager())
self.__downloading.finished[()].connect(self.__rulesDownloaded)
def __rulesDownloaded(self):
@@ -268,7 +268,6 @@
reply = self.sender()
response = reply.readAll()
- redirect = reply.attribute(QNetworkRequest.RedirectionTargetAttribute) or QUrl()
reply.close()
self.__downloading = None
@@ -284,13 +283,6 @@
self.__defaultSubscription = False
return
- if redirect.isValid():
- request = QNetworkRequest(redirect)
- self.__downloading = \
- Helpviewer.HelpWindow.HelpWindow.networkAccessManager().get(request)
- self.__downloading.finished[()].connect(self.__rulesDownloaded)
- return
-
if response.isEmpty():
E5MessageBox.warning(None,
self.trUtf8("Downloading subscription rules"),
