diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/VirusTotal/VirusTotalApi.py
--- a/eric6/WebBrowser/VirusTotal/VirusTotalApi.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/VirusTotal/VirusTotalApi.py Tue Mar 02 17:17:09 2021 +0100
@@ -114,7 +114,7 @@
else:
urlStr = self.GetFileReportPattern.format(protocol)
request = QNetworkRequest(QUrl(urlStr))
- request.setHeader(QNetworkRequest.ContentTypeHeader,
+ request.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader,
"application/x-www-form-urlencoded")
params = QByteArray("apikey={0}&resource={1}".format(
key, self.TestServiceKeyScanID).encode("utf-8"))
@@ -138,7 +138,7 @@
res = False
msg = ""
- if reply.error() == QNetworkReply.NoError:
+ if reply.error() == QNetworkReply.NetworkError.NoError:
res = True
elif reply.error() == self.ServiceCode_InvalidKey:
res = False
@@ -156,7 +156,7 @@
@param url url to be scanned (QUrl)
"""
request = QNetworkRequest(QUrl(self.ScanUrlUrl))
- request.setHeader(QNetworkRequest.ContentTypeHeader,
+ request.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader,
"application/x-www-form-urlencoded")
params = QByteArray("apikey={0}&url=".format(
Preferences.getWebBrowser("VirusTotalServiceKey"))
@@ -177,7 +177,7 @@
@param reply reference to the network reply
@type QNetworkReply
"""
- if reply.error() == QNetworkReply.NoError:
+ if reply.error() == QNetworkReply.NetworkError.NoError:
result = json.loads(str(reply.readAll(), "utf-8"))
if result["response_code"] == self.ServiceResult_ItemPresent:
self.urlScanReport.emit(result["permalink"])
@@ -203,7 +203,7 @@
@param scanId ID of the scan to get the report URL for (string)
"""
request = QNetworkRequest(QUrl(self.GetUrlReportUrl))
- request.setHeader(QNetworkRequest.ContentTypeHeader,
+ request.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader,
"application/x-www-form-urlencoded")
params = QByteArray("apikey={0}&resource={1}".format(
Preferences.getWebBrowser("VirusTotalServiceKey"), scanId)
@@ -225,7 +225,7 @@
@type QNetworkReply
request.
"""
- if reply.error() == QNetworkReply.NoError:
+ if reply.error() == QNetworkReply.NetworkError.NoError:
result = json.loads(str(reply.readAll(), "utf-8"))
if "filescan_id" in result and result["filescan_id"] is not None:
self.__getFileScanReportUrl(result["filescan_id"])
@@ -239,7 +239,7 @@
@param scanId ID of the scan to get the report URL for (string)
"""
request = QNetworkRequest(QUrl(self.GetFileReportUrl))
- request.setHeader(QNetworkRequest.ContentTypeHeader,
+ request.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader,
"application/x-www-form-urlencoded")
params = QByteArray("apikey={0}&resource={1}".format(
Preferences.getWebBrowser("VirusTotalServiceKey"), scanId)
@@ -261,7 +261,7 @@
@param reply reference to the network reply
@type QNetworkReply
"""
- if reply.error() == QNetworkReply.NoError:
+ if reply.error() == QNetworkReply.NetworkError.NoError:
result = json.loads(str(reply.readAll(), "utf-8"))
self.fileScanReport.emit(result["permalink"])
self.__replies.remove(reply)
@@ -301,7 +301,7 @@
@param reply reference to the network reply
@type QNetworkReply
"""
- if reply.error() == QNetworkReply.NoError:
+ if reply.error() == QNetworkReply.NetworkError.NoError:
result = json.loads(str(reply.readAll(), "utf-8"))
if result["response_code"] == 0:
E5MessageBox.information(
@@ -363,7 +363,7 @@
@param reply reference to the network reply
@type QNetworkReply
"""
- if reply.error() == QNetworkReply.NoError:
+ if reply.error() == QNetworkReply.NetworkError.NoError:
result = json.loads(str(reply.readAll(), "utf-8"))
if result["response_code"] == 0:
E5MessageBox.information(
