Mercurial Repositories > eric / file comparison
comparison: E5Network/E5NetworkProxyFactory.py
E5Network/E5NetworkProxyFactory.py
- changeset 1058
- fa1c0fa31041
- parent 945
- 8cd4d08fa9f6
- child 1131
- 7781e396c903
equal
deleted
inserted
replaced
| 1055:885c8d93e6f9 | 1058:fa1c0fa31041 |
|---|---|
| 123 return proxyList | 123 return proxyList |
| 124 else: | 124 else: |
| 125 return [QNetworkProxy(QNetworkProxy.NoProxy)] | 125 return [QNetworkProxy(QNetworkProxy.NoProxy)] |
| 126 else: | 126 else: |
| 127 if Preferences.getUI("UseHttpProxyForAll"): | 127 if Preferences.getUI("UseHttpProxyForAll"): |
| 128 protocol = "Http" | 128 protocolKey = "Http" |
| 129 else: | 129 else: |
| 130 protocol = query.protocolTag().capitalize() | 130 protocolKey = query.protocolTag().capitalize() |
| 131 host = Preferences.getUI("ProxyHost/{0}".format(protocol)) | 131 host = Preferences.getUI("ProxyHost/{0}".format(protocolKey)) |
| 132 if not host: | 132 if not host: |
| 133 E5MessageBox.critical(None, | 133 E5MessageBox.critical(None, |
| 134 QCoreApplication.translate("E5NetworkProxyFactory", | 134 QCoreApplication.translate("E5NetworkProxyFactory", |
| 135 "Proxy Configuration Error"), | 135 "Proxy Configuration Error"), |
| 136 QCoreApplication.translate("E5NetworkProxyFactory", | 136 QCoreApplication.translate("E5NetworkProxyFactory", |
| 137 """Proxy usage was activated""" | 137 """Proxy usage was activated""" |
| 138 """ but no proxy host for protocol""" | 138 """ but no proxy host for protocol""" |
| 139 """ '{0}' configured.""").format(protocol)) | 139 """ '{0}' configured.""").format(protocolKey)) |
| 140 return [QNetworkProxy(QNetworkProxy.DefaultProxy)] | 140 return [QNetworkProxy(QNetworkProxy.DefaultProxy)] |
| 141 else: | 141 else: |
| 142 if protocol == "Http": | 142 if protocolKey in ["Http", "Https", "Ftp"]: |
| 143 proxy = QNetworkProxy(QNetworkProxy.HttpProxy, host, | 143 if query.protocolTag() == "ftp": |
| 144 Preferences.getUI("ProxyPort/Http"), | 144 proxyType = QNetworkProxy.FtpCachingProxy |
| 145 Preferences.getUI("ProxyUser/Http"), | 145 elif query.protocolTag() == "https": |
| 146 Preferences.getUI("ProxyPassword/Http")) | 146 proxyType = QNetworkProxy.HttpCachingProxy |
| 147 elif protocol == "Https": | 147 else: |
| 148 proxy = QNetworkProxy(QNetworkProxy.HttpCachingProxy, host, | 148 proxyType = QNetworkProxy.HttpProxy |
| 149 Preferences.getUI("ProxyPort/Https"), | 149 proxy = QNetworkProxy(proxyType, host, |
| 150 Preferences.getUI("ProxyUser/Https"), | 150 Preferences.getUI("ProxyPort/" + protocolKey), |
| 151 Preferences.getUI("ProxyPassword/Https")) | 151 Preferences.getUI("ProxyUser/" + protocolKey), |
| 152 elif protocol == "Ftp": | 152 Preferences.getUI("ProxyPassword/" + protocolKey)) |
| 153 proxy = QNetworkProxy(QNetworkProxy.FtpCachingProxy, host, | |
| 154 Preferences.getUI("ProxyPort/Ftp"), | |
| 155 Preferences.getUI("ProxyUser/Ftp"), | |
| 156 Preferences.getUI("ProxyPassword/Ftp")) | |
| 157 else: | 153 else: |
| 158 proxy = QNetworkProxy(QNetworkProxy.DefaultProxy) | 154 proxy = QNetworkProxy(QNetworkProxy.DefaultProxy) |
| 159 return [proxy, QNetworkProxy(QNetworkProxy.DefaultProxy)] | 155 return [proxy, QNetworkProxy(QNetworkProxy.DefaultProxy)] |
| 160 else: | 156 else: |
| 161 return [QNetworkProxy(QNetworkProxy.NoProxy)] | 157 return [QNetworkProxy(QNetworkProxy.NoProxy)] |
