Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py	Tue Mar 02 17:17:09 2021 +0100
@@ -82,12 +82,13 @@
         reply = WebBrowserWindow.networkManager().get(req)
         
         while reply.isRunning():
-            QCoreApplication.processEvents(QEventLoop.AllEvents, 200)
+            QCoreApplication.processEvents(
+                QEventLoop.ProcessEventsFlag.AllEvents, 200)
             # max. 200 ms processing
         
         res = None
         error = ""
-        if reply.error() != QNetworkReply.NoError:
+        if reply.error() != QNetworkReply.NetworkError.NoError:
             error = reply.errorString()
             self.networkError.emit(error)
         else:
@@ -139,16 +140,18 @@
         url = QUrl(self.GsbUrlTemplate.format("threatListUpdates:fetch",
                                               self.__apiKey))
         req = QNetworkRequest(url)
-        req.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
+        req.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader,
+                      "application/json")
         reply = WebBrowserWindow.networkManager().post(req, data)
         
         while reply.isRunning():
-            QCoreApplication.processEvents(QEventLoop.AllEvents, 200)
+            QCoreApplication.processEvents(
+                QEventLoop.ProcessEventsFlag.AllEvents, 200)
             # max. 200 ms processing
         
         res = None
         error = ""
-        if reply.error() != QNetworkReply.NoError:
+        if reply.error() != QNetworkReply.NetworkError.NoError:
             error = reply.errorString()
             self.networkError.emit(error)
         else:
@@ -212,15 +215,17 @@
         url = QUrl(self.GsbUrlTemplate.format("fullHashes:find",
                                               self.__apiKey))
         req = QNetworkRequest(url)
-        req.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
+        req.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader,
+                      "application/json")
         reply = WebBrowserWindow.networkManager().post(req, data)
         
         while reply.isRunning():
-            QCoreApplication.processEvents(QEventLoop.AllEvents, 200)
+            QCoreApplication.processEvents(
+                QEventLoop.ProcessEventsFlag.AllEvents, 200)
             # max. 200 ms processing
         
         res = []
-        if reply.error() != QNetworkReply.NoError:
+        if reply.error() != QNetworkReply.NetworkError.NoError:
             self.networkError.emit(reply.errorString())
         else:
             res = self.__extractData(reply)
@@ -297,7 +302,9 @@
         
         # sanitize the URL by removing user info and query data
         url = url.adjusted(
-            QUrl.RemoveUserInfo | QUrl.RemoveQuery | QUrl.RemoveFragment
+            QUrl.UrlFormattingOption.RemoveUserInfo |
+            QUrl.UrlFormattingOption.RemoveQuery |
+            QUrl.UrlFormattingOption.RemoveFragment
         )
         urlStr = url.toString()
         
@@ -333,15 +340,17 @@
         url = QUrl(self.GsbUrlTemplate.format("threatMatches:find",
                                               self.__apiKey))
         req = QNetworkRequest(url)
-        req.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
+        req.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader,
+                      "application/json")
         reply = WebBrowserWindow.networkManager().post(req, data)
         
         while reply.isRunning():
-            QCoreApplication.processEvents(QEventLoop.AllEvents, 200)
+            QCoreApplication.processEvents(
+                QEventLoop.ProcessEventsFlag.AllEvents, 200)
             # max. 200 ms processing
         
         threats = []
-        if reply.error() != QNetworkReply.NoError:
+        if reply.error() != QNetworkReply.NetworkError.NoError:
             error = reply.errorString()
             self.networkError.emit(error)
         else: