Mercurial Repositories > eric / file comparison
comparison: eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py
eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py
- changeset 8143
- 2c730d5fd177
- parent 7923
- 91e843545d9a
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 359 if not self.__include: | 359 if not self.__include: |
| 360 self.__include.append("*") | 360 self.__include.append("*") |
| 361 | 361 |
| 362 nspace = bytes(QCryptographicHash.hash( | 362 nspace = bytes(QCryptographicHash.hash( |
| 363 QByteArray(self.fullName().encode("utf-8")), | 363 QByteArray(self.fullName().encode("utf-8")), |
| 364 QCryptographicHash.Md4).toHex()).decode("ascii") | 364 QCryptographicHash.Algorithm.Md4).toHex()).decode("ascii") |
| 365 valuesScript = values_js.format(nspace) | 365 valuesScript = values_js.format(nspace) |
| 366 self.__script = "(function(){{{0}\n{1}\n{2}\n}})();".format( | 366 self.__script = "(function(){{{0}\n{1}\n{2}\n}})();".format( |
| 367 valuesScript, self.__manager.requireScripts(self.__require), | 367 valuesScript, self.__manager.requireScripts(self.__require), |
| 368 fileData | 368 fileData |
| 369 ) | 369 ) |
| 503 """ | 503 """ |
| 504 if reply in self.__iconReplies: | 504 if reply in self.__iconReplies: |
| 505 self.__iconReplies.remove(reply) | 505 self.__iconReplies.remove(reply) |
| 506 | 506 |
| 507 reply.deleteLater() | 507 reply.deleteLater() |
| 508 if reply.error() == QNetworkReply.NoError: | 508 if reply.error() == QNetworkReply.NetworkError.NoError: |
| 509 self.__icon = QPixmap.fromImage(QImage.fromData(reply.readAll())) | 509 self.__icon = QPixmap.fromImage(QImage.fromData(reply.readAll())) |
