Mercurial Repositories > eric / file comparison
comparison: Helpviewer/OpenSearch/OpenSearchEngine.py
Helpviewer/OpenSearch/OpenSearchEngine.py
- changeset 4326
- e52318f11812
- parent 4158
- bfb56045bc1f
- child 4327
- ff666d8230f7
equal
deleted
inserted
replaced
| 4325:3e6dd786a5ff | 4326:e52318f11812 |
|---|---|
| 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()) |
| 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) |
| 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()))) |
| 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() |
