Mercurial Repositories > eric / file comparison
comparison: Helpviewer/OpenSearch/OpenSearchEngine.py
Helpviewer/OpenSearch/OpenSearchEngine.py
- branch
- 6_0_x
- changeset 4330
- 2c278493b31e
- parent 4159
- ba30f95a0ec2
- child 4333
- ec0664f353b3
equal
deleted
inserted
replaced
| 4329:399e14805a5c | 4330:2c278493b31e |
|---|---|
| 149 """ | 149 """ |
| 150 if not self._searchUrlTemplate: | 150 if not self._searchUrlTemplate: |
| 151 return QUrl() | 151 return QUrl() |
| 152 | 152 |
| 153 ret = QUrl.fromEncoded( | 153 ret = QUrl.fromEncoded( |
| 154 self.parseTemplate(searchTerm, self._searchUrlTemplate)) | 154 self.parseTemplate(searchTerm, self._searchUrlTemplate).encode("utf-8")) |
| 155 | 155 |
| 156 if self.__searchMethod != "post": | 156 if self.__searchMethod != "post": |
| 157 if qVersion() >= "5.0.0": | 157 if qVersion() >= "5.0.0": |
| 158 from PyQt5.QtCore import QUrlQuery | 158 from PyQt5.QtCore import QUrlQuery |
| 159 urlQuery = QUrlQuery(ret) | 159 urlQuery = QUrlQuery(ret) |
| 204 """ | 204 """ |
| 205 if not self._suggestionsUrlTemplate: | 205 if not self._suggestionsUrlTemplate: |
| 206 return QUrl() | 206 return QUrl() |
| 207 | 207 |
| 208 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( | 208 ret = QUrl.fromEncoded(QByteArray(self.parseTemplate( |
| 209 searchTerm, self._suggestionsUrlTemplate))) | 209 searchTerm, self._suggestionsUrlTemplate).encode("utf-8"))) |
| 210 | 210 |
| 211 if self.__searchMethod != "post": | 211 if self.__searchMethod != "post": |
| 212 if qVersion() >= "5.0.0": | 212 if qVersion() >= "5.0.0": |
| 213 from PyQt5.QtCore import QUrlQuery | 213 from PyQt5.QtCore import QUrlQuery |
| 214 urlQuery = QUrlQuery(ret) | 214 urlQuery = QUrlQuery(ret) |
| 335 """ | 335 """ |
| 336 if self.__networkAccessManager is None or not self._imageUrl: | 336 if self.__networkAccessManager is None or not self._imageUrl: |
| 337 return | 337 return |
| 338 | 338 |
| 339 reply = self.__networkAccessManager.get( | 339 reply = self.__networkAccessManager.get( |
| 340 QNetworkRequest(QUrl.fromEncoded(self._imageUrl))) | 340 QNetworkRequest(QUrl.fromEncoded(self._imageUrl.encode("utf-8")))) |
| 341 reply.finished.connect(self.__imageObtained) | 341 reply.finished.connect(self.__imageObtained) |
| 342 self.__replies.append(reply) | 342 self.__replies.append(reply) |
| 343 | 343 |
| 344 def __imageObtained(self): | 344 def __imageObtained(self): |
| 345 """ | 345 """ |
| 357 reply.deleteLater() | 357 reply.deleteLater() |
| 358 | 358 |
| 359 if response.isEmpty(): | 359 if response.isEmpty(): |
| 360 return | 360 return |
| 361 | 361 |
| 362 if response.startsWith("<html>") or response.startsWith("HTML"): | 362 if response.startsWith(b"<html>") or response.startsWith(b"HTML"): |
| 363 self.__iconMoved = True | 363 self.__iconMoved = True |
| 364 self.__image = QImage() | 364 self.__image = QImage() |
| 365 else: | 365 else: |
| 366 self.__image.loadFromData(response) | 366 self.__image.loadFromData(response) |
| 367 self.imageChanged.emit() | 367 self.imageChanged.emit() |
