Mercurial Repositories > eric / file diff

diff -r e97af1181efd -r e16573640cb8 WebBrowser/VirusTotal/VirusTotalApi.py
--- a/WebBrowser/VirusTotal/VirusTotalApi.py	Sat Apr 02 19:44:09 2016 +0200
+++ b/WebBrowser/VirusTotal/VirusTotalApi.py	Sun Apr 03 16:22:18 2016 +0200
@@ -16,7 +16,7 @@
 
 import json
 
-from PyQt5.QtCore import QObject, QUrl, QByteArray, pyqtSignal, qVersion
+from PyQt5.QtCore import pyqtSignal, QObject, QUrl, QUrlQuery, QByteArray
 from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
 
 from E5Gui import E5MessageBox
@@ -159,8 +159,8 @@
         request.setHeader(QNetworkRequest.ContentTypeHeader,
                           "application/x-www-form-urlencoded")
         params = QByteArray("apikey={0}&url=".format(
-            Preferences.getWebBrowser("VirusTotalServiceKey")).encode("utf-8"))\
-            .append(QUrl.toPercentEncoding(url.toString()))
+            Preferences.getWebBrowser("VirusTotalServiceKey"))
+            .encode("utf-8")).append(QUrl.toPercentEncoding(url.toString()))
         
         import WebBrowser.WebBrowserWindow
         nam = WebBrowser.WebBrowserWindow.WebBrowserWindow\
@@ -272,13 +272,9 @@
             ("ip", ipAddress),
         ]
         url = QUrl(self.GetIpAddressReportUrl)
-        if qVersion() >= "5.0.0":
-            from PyQt5.QtCore import QUrlQuery
-            query = QUrlQuery()
-            query.setQueryItems(queryItems)
-            url.setQuery(query)
-        else:
-            url.setQueryItems(queryItems)
+        query = QUrlQuery()
+        query.setQueryItems(queryItems)
+        url.setQuery(query)
         request = QNetworkRequest(url)
         
         import WebBrowser.WebBrowserWindow
@@ -335,13 +331,9 @@
             ("domain", domain),
         ]
         url = QUrl(self.GetDomainReportUrl)
-        if qVersion() >= "5.0.0":
-            from PyQt5.QtCore import QUrlQuery
-            query = QUrlQuery()
-            query.setQueryItems(queryItems)
-            url.setQuery(query)
-        else:
-            url.setQueryItems(queryItems)
+        query = QUrlQuery()
+        query.setQueryItems(queryItems)
+        url.setQuery(query)
         request = QNetworkRequest(url)
         
         import WebBrowser.WebBrowserWindow