Mercurial Repositories > eric / file comparison
comparison: Helpviewer/OpenSearch/OpenSearchEngine.py
Helpviewer/OpenSearch/OpenSearchEngine.py
- changeset 3776
- ccb6eacb50e5
- parent 3702
- dabc69b82c7c
- child 3788
- 195dd519bf29
equal
deleted
inserted
replaced
| 3774:285e5aa860a0 | 3776:ccb6eacb50e5 |
|---|---|
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 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, QUrlQuery, \ | 15 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, \ |
| 16 QByteArray, QBuffer, QIODevice, QObject | 16 QBuffer, QIODevice, QObject, qVersion |
| 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 | 19 |
| 20 from UI.Info import Program | 20 from UI.Info import Program |
| 21 | 21 |
| 151 | 151 |
| 152 ret = QUrl.fromEncoded( | 152 ret = QUrl.fromEncoded( |
| 153 self.parseTemplate(searchTerm, self._searchUrlTemplate)) | 153 self.parseTemplate(searchTerm, self._searchUrlTemplate)) |
| 154 | 154 |
| 155 if self.__searchMethod != "post": | 155 if self.__searchMethod != "post": |
| 156 urlQuery = QUrlQuery() | 156 if qVersion() >= "5.0.0": |
| 157 for parameter in self._searchParameters: | 157 from PyQt5.QtCore import QUrlQuery |
| 158 urlQuery.addQueryItem( | 158 urlQuery = QUrlQuery() |
| 159 parameter[0], self.parseTemplate(searchTerm, parameter[1])) | 159 for parameter in self._searchParameters: |
| 160 ret.setQuery(urlQuery) | 160 urlQuery.addQueryItem( |
| 161 parameter[0], | |
| 162 self.parseTemplate(searchTerm, parameter[1])) | |
| 163 ret.setQuery(urlQuery) | |
| 164 else: | |
| 165 for parameter in self._searchParameters: | |
| 166 ret.addQueryItem( | |
| 167 parameter[0], | |
| 168 self.parseTemplate(searchTerm, parameter[1])) | |
| 161 | 169 |
| 162 return ret | 170 return ret |
| 163 | 171 |
| 164 def providesSuggestions(self): | 172 def providesSuggestions(self): |
| 165 """ | 173 """ |
| 198 | 206 |
| 199 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( | 207 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( |
| 200 searchTerm, self._suggestionsUrlTemplate))) | 208 searchTerm, self._suggestionsUrlTemplate))) |
| 201 | 209 |
| 202 if self.__searchMethod != "post": | 210 if self.__searchMethod != "post": |
| 203 urlQuery = QUrlQuery() | 211 if qVersion() >= "5.0.0": |
| 204 for parameter in self._suggestionsParameters: | 212 from PyQt5.QtCore import QUrlQuery |
| 205 urlQuery.addQueryItem( | 213 urlQuery = QUrlQuery() |
| 206 parameter[0], self.parseTemplate(searchTerm, parameter[1])) | 214 for parameter in self._suggestionsParameters: |
| 207 ret.setQuery(urlQuery) | 215 urlQuery.addQueryItem( |
| 216 parameter[0], | |
| 217 self.parseTemplate(searchTerm, parameter[1])) | |
| 218 ret.setQuery(urlQuery) | |
| 219 else: | |
| 220 for parameter in self._suggestionsParameters: | |
| 221 ret.addQueryItem( | |
| 222 parameter[0], | |
| 223 self.parseTemplate(searchTerm, parameter[1])) | |
| 208 | 224 |
| 209 return ret | 225 return ret |
| 210 | 226 |
| 211 def searchParameters(self): | 227 def searchParameters(self): |
| 212 """ | 228 """ |
