Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 381
- 64ae9e09d8bc
- parent 286
- 652f5159f1c3
- child 491
- ac476c22d392
equal
deleted
inserted
replaced
| 376:0c4c359c4870 | 381:64ae9e09d8bc |
|---|---|
| 16 from PyQt4.QtNetwork import QSsl, QSslCertificate, QSslConfiguration, QSslSocket | 16 from PyQt4.QtNetwork import QSsl, QSslCertificate, QSslConfiguration, QSslSocket |
| 17 SSL_AVAILABLE = True | 17 SSL_AVAILABLE = True |
| 18 except ImportError: | 18 except ImportError: |
| 19 SSL_AVAILABLE = False | 19 SSL_AVAILABLE = False |
| 20 | 20 |
| 21 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory, proxyAuthenticationRequired | 21 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory, \ |
| 22 proxyAuthenticationRequired | |
| 22 | 23 |
| 23 from UI.AuthenticationDialog import AuthenticationDialog | 24 from UI.AuthenticationDialog import AuthenticationDialog |
| 24 | 25 |
| 25 from Helpviewer.HelpLanguagesDialog import HelpLanguagesDialog | 26 from Helpviewer.HelpLanguagesDialog import HelpLanguagesDialog |
| 26 import Helpviewer.HelpWindow | 27 import Helpviewer.HelpWindow |
| 125 reply = self.__schemeHandlers[scheme]\ | 126 reply = self.__schemeHandlers[scheme]\ |
| 126 .createRequest(op, request, outgoingData) | 127 .createRequest(op, request, outgoingData) |
| 127 if reply is not None: | 128 if reply is not None: |
| 128 return reply | 129 return reply |
| 129 | 130 |
| 131 req = QNetworkRequest(request) | |
| 132 if hasattr(QNetworkRequest, 'HttpPipeliningAllowedAttribute'): | |
| 133 req.setAttribute(QNetworkRequest.HttpPipeliningAllowedAttribute, True); | |
| 130 if not self.__acceptLanguage.isEmpty(): | 134 if not self.__acceptLanguage.isEmpty(): |
| 131 req = QNetworkRequest(request) | |
| 132 req.setRawHeader("Accept-Language", self.__acceptLanguage) | 135 req.setRawHeader("Accept-Language", self.__acceptLanguage) |
| 133 else: | |
| 134 req = request | |
| 135 | 136 |
| 136 # AdBlock code | 137 # AdBlock code |
| 137 if op == QNetworkAccessManager.GetOperation: | 138 if op == QNetworkAccessManager.GetOperation: |
| 138 if self.__adblockNetwork is None: | 139 if self.__adblockNetwork is None: |
| 139 self.__adblockNetwork = \ | 140 self.__adblockNetwork = \ |
