Mercurial Repositories > eric / file comparison
comparison: E5Network/E5NetworkProxyFactory.py
E5Network/E5NetworkProxyFactory.py
- changeset 317
- f6b0163a21be
- parent 289
- baf4c1354c6a
- child 319
- 09f456ec6fcf
equal
deleted
inserted
replaced
| 316:b7e499650928 | 317:f6b0163a21be |
|---|---|
| 103 proxyType = QNetworkProxy.HttpProxy | 103 proxyType = QNetworkProxy.HttpProxy |
| 104 proxy = QNetworkProxy(proxyType, url.host(), url.port(), | 104 proxy = QNetworkProxy(proxyType, url.host(), url.port(), |
| 105 url.userName(), url.password()) | 105 url.userName(), url.password()) |
| 106 proxyList = [proxy] | 106 proxyList = [proxy] |
| 107 break | 107 break |
| 108 scheme = schemeFromProxyType(proxyList[0].type()) | 108 if proxyList: |
| 109 if scheme == "": | 109 scheme = schemeFromProxyType(proxyList[0].type()) |
| 110 scheme = "Http" | 110 if scheme == "": |
| 111 if scheme != "NoProxy": | 111 scheme = "Http" |
| 112 proxyList[0].setUser( | 112 if scheme != "NoProxy": |
| 113 Preferences.getUI("ProxyUser/{0}".format(scheme))) | 113 proxyList[0].setUser( |
| 114 proxyList[0].setPassword( | 114 Preferences.getUI("ProxyUser/{0}".format(scheme))) |
| 115 Preferences.getUI("ProxyPassword/{0}".format(scheme))) | 115 proxyList[0].setPassword( |
| 116 Preferences.getUI("ProxyPassword/{0}".format(scheme))) | |
| 116 return proxyList | 117 return proxyList |
| 117 else: | 118 else: |
| 118 if Preferences.getUI("UseHttpProxyForAll"): | 119 if Preferences.getUI("UseHttpProxyForAll"): |
| 119 protocol = "Http" | 120 protocol = "Http" |
| 120 else: | 121 else: |
