diff -r e97af1181efd -r e16573640cb8 WebBrowser/OpenSearch/OpenSearchEngine.py
--- a/WebBrowser/OpenSearch/OpenSearchEngine.py Sat Apr 02 19:44:09 2016 +0200
+++ b/WebBrowser/OpenSearch/OpenSearchEngine.py Sun Apr 03 16:22:18 2016 +0200
@@ -12,8 +12,8 @@
import re
import json
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, \
- QBuffer, QIODevice, QObject, qVersion
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QUrlQuery, \
+ QByteArray, QBuffer, QIODevice, QObject
from PyQt5.QtGui import QImage
from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager, \
QNetworkReply
@@ -178,19 +178,12 @@
.encode("utf-8"))
if self.__searchMethod != "post":
- if qVersion() >= "5.0.0":
- from PyQt5.QtCore import QUrlQuery
- urlQuery = QUrlQuery(ret)
- for parameter in self._searchParameters:
- urlQuery.addQueryItem(
- parameter[0],
- self.parseTemplate(searchTerm, parameter[1]))
- ret.setQuery(urlQuery)
- else:
- for parameter in self._searchParameters:
- ret.addQueryItem(
- parameter[0],
- self.parseTemplate(searchTerm, parameter[1]))
+ urlQuery = QUrlQuery(ret)
+ for parameter in self._searchParameters:
+ urlQuery.addQueryItem(
+ parameter[0],
+ self.parseTemplate(searchTerm, parameter[1]))
+ ret.setQuery(urlQuery)
return ret
@@ -233,19 +226,12 @@
searchTerm, self._suggestionsUrlTemplate).encode("utf-8")))
if self.__searchMethod != "post":
- if qVersion() >= "5.0.0":
- from PyQt5.QtCore import QUrlQuery
- urlQuery = QUrlQuery(ret)
- for parameter in self._suggestionsParameters:
- urlQuery.addQueryItem(
- parameter[0],
- self.parseTemplate(searchTerm, parameter[1]))
- ret.setQuery(urlQuery)
- else:
- for parameter in self._suggestionsParameters:
- ret.addQueryItem(
- parameter[0],
- self.parseTemplate(searchTerm, parameter[1]))
+ urlQuery = QUrlQuery(ret)
+ for parameter in self._suggestionsParameters:
+ urlQuery.addQueryItem(
+ parameter[0],
+ self.parseTemplate(searchTerm, parameter[1]))
+ ret.setQuery(urlQuery)
return ret
