Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 4326
- e52318f11812
- parent 4317
- 0de465a93200
- child 4331
- 711e7c35a49b
equal
deleted
inserted
replaced
| 4325:3e6dd786a5ff | 4326:e52318f11812 |
|---|---|
| 139 .createRequest(op, request, outgoingData) | 139 .createRequest(op, request, outgoingData) |
| 140 if reply is not None: | 140 if reply is not None: |
| 141 return reply | 141 return reply |
| 142 | 142 |
| 143 req = QNetworkRequest(request) | 143 req = QNetworkRequest(request) |
| 144 if req.rawHeader("X-Eric6-UserLoadAction") == QByteArray("1"): | 144 if req.rawHeader(b"X-Eric6-UserLoadAction") == QByteArray(b"1"): |
| 145 req.setRawHeader("X-Eric6-UserLoadAction", QByteArray()) | 145 req.setRawHeader(b"X-Eric6-UserLoadAction", QByteArray()) |
| 146 req.setAttribute(QNetworkRequest.User + 200, "") | 146 req.setAttribute(QNetworkRequest.User + 200, "") |
| 147 else: | 147 else: |
| 148 req.setAttribute( | 148 req.setAttribute( |
| 149 QNetworkRequest.User + 200, req.rawHeader("Referer")) | 149 QNetworkRequest.User + 200, req.rawHeader(b"Referer")) |
| 150 | 150 |
| 151 if hasattr(QNetworkRequest, 'HttpPipeliningAllowedAttribute'): | 151 if hasattr(QNetworkRequest, 'HttpPipeliningAllowedAttribute'): |
| 152 req.setAttribute( | 152 req.setAttribute( |
| 153 QNetworkRequest.HttpPipeliningAllowedAttribute, True) | 153 QNetworkRequest.HttpPipeliningAllowedAttribute, True) |
| 154 if not self.__acceptLanguage.isEmpty(): | 154 if not self.__acceptLanguage.isEmpty(): |
| 155 req.setRawHeader("Accept-Language", self.__acceptLanguage) | 155 req.setRawHeader(b"Accept-Language", self.__acceptLanguage) |
| 156 | 156 |
| 157 # AdBlock code | 157 # AdBlock code |
| 158 if op == QNetworkAccessManager.GetOperation: | 158 if op == QNetworkAccessManager.GetOperation: |
| 159 if self.__adblockNetwork is None: | 159 if self.__adblockNetwork is None: |
| 160 self.__adblockNetwork = \ | 160 self.__adblockNetwork = \ |
| 182 QNetworkRequest.CacheLoadControlAttribute, | 182 QNetworkRequest.CacheLoadControlAttribute, |
| 183 QNetworkRequest.AlwaysNetwork) | 183 QNetworkRequest.AlwaysNetwork) |
| 184 | 184 |
| 185 # Do Not Track feature | 185 # Do Not Track feature |
| 186 if self.__doNotTrack: | 186 if self.__doNotTrack: |
| 187 req.setRawHeader("DNT", "1") | 187 req.setRawHeader(b"DNT", b"1") |
| 188 req.setRawHeader("X-Do-Not-Track", "1") | 188 req.setRawHeader(b"X-Do-Not-Track", b"1") |
| 189 | 189 |
| 190 # Send referer header? | 190 # Send referer header? |
| 191 if not self.__sendReferer and \ | 191 if not self.__sendReferer and \ |
| 192 req.url().host() not in Preferences.getHelp("SendRefererWhitelist"): | 192 req.url().host() not in Preferences.getHelp("SendRefererWhitelist"): |
| 193 req.setRawHeader("Referer", "") | 193 req.setRawHeader(b"Referer", "") |
| 194 | 194 |
| 195 reply = QNetworkAccessManager.createRequest( | 195 reply = QNetworkAccessManager.createRequest( |
| 196 self, op, req, outgoingData) | 196 self, op, req, outgoingData) |
| 197 self.requestCreated.emit(op, req, reply) | 197 self.requestCreated.emit(op, req, reply) |
| 198 | 198 |
