WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py

branch
QtWebEngine
changeset 4902
7a49807e493c
parent 4886
b56735d36159
child 5389
9b1c800daff3
--- a/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py	Mon Mar 28 13:49:24 2016 +0200
+++ b/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py	Mon Mar 28 15:31:47 2016 +0200
@@ -13,12 +13,11 @@
 
 from PyQt5.QtCore import pyqtSignal, QObject, QSettings, QRegExp, QUrl
 from PyQt5.QtWidgets import QDialog
-from PyQt5.QtNetwork import QNetworkReply
+from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
 
 from E5Gui import E5MessageBox
 
 from WebBrowser.WebBrowserWindow import WebBrowserWindow
-from WebBrowser.Network.FollowRedirectReply import FollowRedirectReply
 
 
 class GreaseMonkeyDownloader(QObject):
@@ -40,8 +39,8 @@
         
         self.__manager = manager
         
-        self.__reply = FollowRedirectReply(
-            url, WebBrowserWindow.networkManager())
+        self.__reply = WebBrowserWindow.networkManager().get(
+            QNetworkRequest(url))
         self.__reply.finished.connect(self.__scriptDownloaded)
         
         self.__fileName = ""
@@ -148,9 +147,8 @@
         Private slot to initiate the download of required scripts.
         """
         if self.__requireUrls:
-            self.__reply = FollowRedirectReply(
-                self.__requireUrls.pop(0),
-                WebBrowserWindow.networkManager())
+            self.__reply = WebBrowserWindow.networkManager().get(
+                QNetworkRequest(self.__requireUrls.pop(0)))
             self.__reply.finished.connect(self.__requireDownloaded)
         else:
             from .GreaseMonkeyScript import GreaseMonkeyScript

eric ide

mercurial