Mercurial Repositories > eric / file comparison
comparison: Helpviewer/OpenSearch/OpenSearchEngine.py
Helpviewer/OpenSearch/OpenSearchEngine.py
- changeset 5736
- 000ea446ff4b
- parent 5389
- 9b1c800daff3
- child 6048
- 82ad8ec9548c
equal
deleted
inserted
replaced
| 5735:f606dbe20be6 | 5736:000ea446ff4b |
|---|---|
| 11 | 11 |
| 12 import re | 12 import re |
| 13 import json | 13 import json |
| 14 | 14 |
| 15 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, \ | 15 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, \ |
| 16 QBuffer, QIODevice, QObject, qVersion | 16 QBuffer, QIODevice, QObject |
| 17 from PyQt5.QtGui import QImage | 17 from PyQt5.QtGui import QImage |
| 18 from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager, \ | 18 from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager, \ |
| 19 QNetworkReply | 19 QNetworkReply |
| 20 | 20 |
| 21 from UI.Info import Program | 21 from UI.Info import Program |
| 22 | 22 |
| 23 import Preferences | 23 import Preferences |
| 24 import Utilities | 24 import Utilities |
| 25 from Globals import qVersionTuple | |
| 25 | 26 |
| 26 | 27 |
| 27 class OpenSearchEngine(QObject): | 28 class OpenSearchEngine(QObject): |
| 28 """ | 29 """ |
| 29 Class implementing the open search engine. | 30 Class implementing the open search engine. |
| 177 ret = QUrl.fromEncoded( | 178 ret = QUrl.fromEncoded( |
| 178 self.parseTemplate(searchTerm, self._searchUrlTemplate) | 179 self.parseTemplate(searchTerm, self._searchUrlTemplate) |
| 179 .encode("utf-8")) | 180 .encode("utf-8")) |
| 180 | 181 |
| 181 if self.__searchMethod != "post": | 182 if self.__searchMethod != "post": |
| 182 if qVersion() >= "5.0.0": | 183 if qVersionTuple() >= (5, 0, 0): |
| 183 from PyQt5.QtCore import QUrlQuery | 184 from PyQt5.QtCore import QUrlQuery |
| 184 urlQuery = QUrlQuery(ret) | 185 urlQuery = QUrlQuery(ret) |
| 185 for parameter in self._searchParameters: | 186 for parameter in self._searchParameters: |
| 186 urlQuery.addQueryItem( | 187 urlQuery.addQueryItem( |
| 187 parameter[0], | 188 parameter[0], |
| 232 | 233 |
| 233 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( | 234 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( |
| 234 searchTerm, self._suggestionsUrlTemplate).encode("utf-8"))) | 235 searchTerm, self._suggestionsUrlTemplate).encode("utf-8"))) |
| 235 | 236 |
| 236 if self.__searchMethod != "post": | 237 if self.__searchMethod != "post": |
| 237 if qVersion() >= "5.0.0": | 238 if qVersionTuple() >= (5, 0, 0): |
| 238 from PyQt5.QtCore import QUrlQuery | 239 from PyQt5.QtCore import QUrlQuery |
| 239 urlQuery = QUrlQuery(ret) | 240 urlQuery = QUrlQuery(ret) |
| 240 for parameter in self._suggestionsParameters: | 241 for parameter in self._suggestionsParameters: |
| 241 urlQuery.addQueryItem( | 242 urlQuery.addQueryItem( |
| 242 parameter[0], | 243 parameter[0], |
