Mercurial Repositories > eric / file comparison
comparison: Helpviewer/OpenSearch/OpenSearchEngine.py
Helpviewer/OpenSearch/OpenSearchEngine.py
- changeset 3702
- dabc69b82c7c
- parent 3656
- 441956d8fce5
- child 3776
- ccb6eacb50e5
equal
deleted
inserted
replaced
| 3701:864226db1abe | 3702:dabc69b82c7c |
|---|---|
| 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 | 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 | 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 for parameter in self._searchParameters: | 157 for parameter in self._searchParameters: |
| 157 ret.addQueryItem(parameter[0], | 158 urlQuery.addQueryItem( |
| 158 self.parseTemplate(searchTerm, parameter[1])) | 159 parameter[0], self.parseTemplate(searchTerm, parameter[1])) |
| 160 ret.setQuery(urlQuery) | |
| 159 | 161 |
| 160 return ret | 162 return ret |
| 161 | 163 |
| 162 def providesSuggestions(self): | 164 def providesSuggestions(self): |
| 163 """ | 165 """ |
| 196 | 198 |
| 197 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( | 199 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( |
| 198 searchTerm, self._suggestionsUrlTemplate))) | 200 searchTerm, self._suggestionsUrlTemplate))) |
| 199 | 201 |
| 200 if self.__searchMethod != "post": | 202 if self.__searchMethod != "post": |
| 203 urlQuery = QUrlQuery() | |
| 201 for parameter in self._suggestionsParameters: | 204 for parameter in self._suggestionsParameters: |
| 202 ret.addQueryItem(parameter[0], | 205 urlQuery.addQueryItem( |
| 203 self.parseTemplate(searchTerm, parameter[1])) | 206 parameter[0], self.parseTemplate(searchTerm, parameter[1])) |
| 207 ret.setQuery(urlQuery) | |
| 204 | 208 |
| 205 return ret | 209 return ret |
| 206 | 210 |
| 207 def searchParameters(self): | 211 def searchParameters(self): |
| 208 """ | 212 """ |
