Mercurial Repositories > eric / file comparison
comparison: Helpviewer/AdBlock/AdBlockAccessHandler.py
Helpviewer/AdBlock/AdBlockAccessHandler.py
- branch
- 6_0_x
- changeset 4340
- b60f7c844265
- parent 4022
- f5f42921717e
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4338:844a1c6f8103 | 4340:b60f7c844265 |
|---|---|
| 7 Module implementing a scheme access handler for AdBlock URLs. | 7 Module implementing a scheme access handler for AdBlock URLs. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 from PyQt5.QtCore import qVersion | 12 from PyQt5.QtCore import qVersion, QByteArray |
| 13 from PyQt5.QtNetwork import QNetworkAccessManager | 13 from PyQt5.QtNetwork import QNetworkAccessManager |
| 14 | 14 |
| 15 from E5Gui import E5MessageBox | 15 from E5Gui import E5MessageBox |
| 16 | 16 |
| 17 from Helpviewer.Network.SchemeAccessHandler import SchemeAccessHandler | 17 from Helpviewer.Network.SchemeAccessHandler import SchemeAccessHandler |
| 39 url = request.url() | 39 url = request.url() |
| 40 if url.path() != "subscribe": | 40 if url.path() != "subscribe": |
| 41 return None | 41 return None |
| 42 | 42 |
| 43 if qVersion() >= "5.0.0": | 43 if qVersion() >= "5.0.0": |
| 44 from PyQt5.QtCore import QUrlQuery | 44 from PyQt5.QtCore import QUrlQuery, QUrl |
| 45 title = QUrlQuery(url).queryItemValue("title") | 45 title = QUrl.fromPercentEncoding( |
| 46 QByteArray(QUrlQuery(url).queryItemValue("title").encode())) | |
| 46 else: | 47 else: |
| 47 from PyQt5.QtCore import QUrl | 48 from PyQt5.QtCore import QUrl |
| 48 title = QUrl.fromPercentEncoding( | 49 title = QUrl.fromPercentEncoding( |
| 49 url.encodedQueryItemValue("title")) | 50 url.encodedQueryItemValue(b"title")) |
| 50 if not title: | 51 if not title: |
| 51 return None | 52 return None |
| 52 res = E5MessageBox.yesNo( | 53 res = E5MessageBox.yesNo( |
| 53 None, | 54 None, |
| 54 self.tr("Subscribe?"), | 55 self.tr("Subscribe?"), |
