Mercurial Repositories > eric / file comparison
comparison: WebBrowser/OpenSearch/OpenSearchEngine.py
WebBrowser/OpenSearch/OpenSearchEngine.py
- branch
- QtWebEngine
- changeset 4913
- e16573640cb8
- parent 4801
- 71bdc520f640
- child 5389
- 9b1c800daff3
equal
deleted
inserted
replaced
| 4910:e97af1181efd | 4913:e16573640cb8 |
|---|---|
| 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, QByteArray, \ | 15 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QUrlQuery, \ |
| 16 QBuffer, QIODevice, QObject, qVersion | 16 QByteArray, 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 |
| 176 ret = QUrl.fromEncoded( | 176 ret = QUrl.fromEncoded( |
| 177 self.parseTemplate(searchTerm, self._searchUrlTemplate) | 177 self.parseTemplate(searchTerm, self._searchUrlTemplate) |
| 178 .encode("utf-8")) | 178 .encode("utf-8")) |
| 179 | 179 |
| 180 if self.__searchMethod != "post": | 180 if self.__searchMethod != "post": |
| 181 if qVersion() >= "5.0.0": | 181 urlQuery = QUrlQuery(ret) |
| 182 from PyQt5.QtCore import QUrlQuery | 182 for parameter in self._searchParameters: |
| 183 urlQuery = QUrlQuery(ret) | 183 urlQuery.addQueryItem( |
| 184 for parameter in self._searchParameters: | 184 parameter[0], |
| 185 urlQuery.addQueryItem( | 185 self.parseTemplate(searchTerm, parameter[1])) |
| 186 parameter[0], | 186 ret.setQuery(urlQuery) |
| 187 self.parseTemplate(searchTerm, parameter[1])) | |
| 188 ret.setQuery(urlQuery) | |
| 189 else: | |
| 190 for parameter in self._searchParameters: | |
| 191 ret.addQueryItem( | |
| 192 parameter[0], | |
| 193 self.parseTemplate(searchTerm, parameter[1])) | |
| 194 | 187 |
| 195 return ret | 188 return ret |
| 196 | 189 |
| 197 def providesSuggestions(self): | 190 def providesSuggestions(self): |
| 198 """ | 191 """ |
| 231 | 224 |
| 232 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( | 225 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( |
| 233 searchTerm, self._suggestionsUrlTemplate).encode("utf-8"))) | 226 searchTerm, self._suggestionsUrlTemplate).encode("utf-8"))) |
| 234 | 227 |
| 235 if self.__searchMethod != "post": | 228 if self.__searchMethod != "post": |
| 236 if qVersion() >= "5.0.0": | 229 urlQuery = QUrlQuery(ret) |
| 237 from PyQt5.QtCore import QUrlQuery | 230 for parameter in self._suggestionsParameters: |
| 238 urlQuery = QUrlQuery(ret) | 231 urlQuery.addQueryItem( |
| 239 for parameter in self._suggestionsParameters: | 232 parameter[0], |
| 240 urlQuery.addQueryItem( | 233 self.parseTemplate(searchTerm, parameter[1])) |
| 241 parameter[0], | 234 ret.setQuery(urlQuery) |
| 242 self.parseTemplate(searchTerm, parameter[1])) | |
| 243 ret.setQuery(urlQuery) | |
| 244 else: | |
| 245 for parameter in self._suggestionsParameters: | |
| 246 ret.addQueryItem( | |
| 247 parameter[0], | |
| 248 self.parseTemplate(searchTerm, parameter[1])) | |
| 249 | 235 |
| 250 return ret | 236 return ret |
| 251 | 237 |
| 252 def searchParameters(self): | 238 def searchParameters(self): |
| 253 """ | 239 """ |
