Mercurial Repositories > eric / file comparison
comparison: E5Network/E5NetworkProxyFactory.py
E5Network/E5NetworkProxyFactory.py
- branch
- 5_1_x
- changeset 1060
- e56185898d97
- parent 882
- 34b86be88bf0
- child 1361
- 39631c724b05
equal
deleted
inserted
replaced
| 1057:fed2f10ce334 | 1060:e56185898d97 |
|---|---|
| 120 return proxyList | 120 return proxyList |
| 121 else: | 121 else: |
| 122 return [QNetworkProxy(QNetworkProxy.NoProxy)] | 122 return [QNetworkProxy(QNetworkProxy.NoProxy)] |
| 123 else: | 123 else: |
| 124 if Preferences.getUI("UseHttpProxyForAll"): | 124 if Preferences.getUI("UseHttpProxyForAll"): |
| 125 protocol = "Http" | 125 protocolKey = "Http" |
| 126 else: | 126 else: |
| 127 protocol = query.protocolTag().capitalize() | 127 protocolKey = query.protocolTag().capitalize() |
| 128 host = Preferences.getUI("ProxyHost/{0}".format(protocol)) | 128 host = Preferences.getUI("ProxyHost/{0}".format(protocolKey)) |
| 129 if not host: | 129 if not host: |
| 130 E5MessageBox.critical(None, | 130 E5MessageBox.critical(None, |
| 131 QCoreApplication.translate("E5NetworkProxyFactory", | 131 QCoreApplication.translate("E5NetworkProxyFactory", |
| 132 "Proxy Configuration Error"), | 132 "Proxy Configuration Error"), |
| 133 QCoreApplication.translate("E5NetworkProxyFactory", | 133 QCoreApplication.translate("E5NetworkProxyFactory", |
| 134 """Proxy usage was activated""" | 134 """Proxy usage was activated""" |
| 135 """ but no proxy host for protocol""" | 135 """ but no proxy host for protocol""" |
| 136 """ '{0}' configured.""").format(protocol)) | 136 """ '{0}' configured.""").format(protocolKey)) |
| 137 return [QNetworkProxy(QNetworkProxy.DefaultProxy)] | 137 return [QNetworkProxy(QNetworkProxy.DefaultProxy)] |
| 138 else: | 138 else: |
| 139 if protocol == "Http": | 139 if protocolKey in ["Http", "Https", "Ftp"]: |
| 140 proxy = QNetworkProxy(QNetworkProxy.HttpProxy, host, | 140 if query.protocolTag() == "ftp": |
| 141 Preferences.getUI("ProxyPort/Http"), | 141 proxyType = QNetworkProxy.FtpCachingProxy |
| 142 Preferences.getUI("ProxyUser/Http"), | 142 elif query.protocolTag() == "https": |
| 143 Preferences.getUI("ProxyPassword/Http")) | 143 proxyType = QNetworkProxy.HttpCachingProxy |
| 144 elif protocol == "Https": | 144 else: |
| 145 proxy = QNetworkProxy(QNetworkProxy.HttpCachingProxy, host, | 145 proxyType = QNetworkProxy.HttpProxy |
| 146 Preferences.getUI("ProxyPort/Https"), | 146 proxy = QNetworkProxy(proxyType, host, |
| 147 Preferences.getUI("ProxyUser/Https"), | 147 Preferences.getUI("ProxyPort/" + protocolKey), |
| 148 Preferences.getUI("ProxyPassword/Https")) | 148 Preferences.getUI("ProxyUser/" + protocolKey), |
| 149 elif protocol == "Ftp": | 149 Preferences.getUI("ProxyPassword/" + protocolKey)) |
| 150 proxy = QNetworkProxy(QNetworkProxy.FtpCachingProxy, host, | |
| 151 Preferences.getUI("ProxyPort/Ftp"), | |
| 152 Preferences.getUI("ProxyUser/Ftp"), | |
| 153 Preferences.getUI("ProxyPassword/Ftp")) | |
| 154 else: | 150 else: |
| 155 proxy = QNetworkProxy(QNetworkProxy.DefaultProxy) | 151 proxy = QNetworkProxy(QNetworkProxy.DefaultProxy) |
| 156 return [proxy, QNetworkProxy(QNetworkProxy.DefaultProxy)] | 152 return [proxy, QNetworkProxy(QNetworkProxy.DefaultProxy)] |
| 157 else: | 153 else: |
| 158 return [QNetworkProxy(QNetworkProxy.NoProxy)] | 154 return [QNetworkProxy(QNetworkProxy.NoProxy)] |
