Fixed an issue in AdBlockRule.py caused by a wrong NetworkAccessManager setting.

Sun, 18 Dec 2016 18:46:43 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 18 Dec 2016 18:46:43 +0100
changeset 5383
4bf49e0840f3
parent 5382
5b772524f302
child 5384
22c15d7e2cad

Fixed an issue in AdBlockRule.py caused by a wrong NetworkAccessManager setting.

Helpviewer/AdBlock/AdBlockRule.py file | annotate | diff | comparison | revisions
Helpviewer/Network/NetworkAccessManager.py file | annotate | diff | comparison | revisions
--- a/Helpviewer/AdBlock/AdBlockRule.py	Sun Dec 18 13:42:41 2016 +0100
+++ b/Helpviewer/AdBlock/AdBlockRule.py	Sun Dec 18 18:46:43 2016 +0100
@@ -365,7 +365,8 @@
         @param req request object to check (QNetworkRequest)
         @return flag indicating a match (boolean)
         """
-        referer = bytes(req.attribute(QNetworkRequest.User + 200, "")).decode()
+        referer = \
+            bytes(req.attribute(QNetworkRequest.User + 200, b"")).decode()
         if referer == "":
             return False
         
--- a/Helpviewer/Network/NetworkAccessManager.py	Sun Dec 18 13:42:41 2016 +0100
+++ b/Helpviewer/Network/NetworkAccessManager.py	Sun Dec 18 18:46:43 2016 +0100
@@ -143,7 +143,7 @@
         req = QNetworkRequest(request)
         if req.rawHeader(b"X-Eric6-UserLoadAction") == QByteArray(b"1"):
             req.setRawHeader(b"X-Eric6-UserLoadAction", QByteArray())
-            req.setAttribute(QNetworkRequest.User + 200, "")
+            req.setAttribute(QNetworkRequest.User + 200, b"")
         else:
             req.setAttribute(
                 QNetworkRequest.User + 200, req.rawHeader(b"Referer"))

eric ide

mercurial