Mercurial Repositories > eric / file comparison
comparison: E5Network/E5NetworkProxyFactory.py
E5Network/E5NetworkProxyFactory.py
- branch
- 5_0_x
- changeset 320
- 340a978859c6
- parent 318
- e513e6d31858
- child 792
- a13346916170
equal
deleted
inserted
replaced
| 318:e513e6d31858 | 320:340a978859c6 |
|---|---|
| 58 proxyList = [proxy] | 58 proxyList = [proxy] |
| 59 break | 59 break |
| 60 if proxyList: | 60 if proxyList: |
| 61 proxyList[0].setUser(Preferences.getUI("ProxyUser")) | 61 proxyList[0].setUser(Preferences.getUI("ProxyUser")) |
| 62 proxyList[0].setPassword(Preferences.getUI("ProxyPassword")) | 62 proxyList[0].setPassword(Preferences.getUI("ProxyPassword")) |
| 63 return proxyList | 63 return proxyList |
| 64 else: | |
| 65 return [QNetworkProxy(QNetworkProxy.NoProxy)] | |
| 64 else: | 66 else: |
| 65 host = Preferences.getUI("ProxyHost") | 67 host = Preferences.getUI("ProxyHost") |
| 66 if not host: | 68 if not host: |
| 67 QMessageBox.critical(None, | 69 QMessageBox.critical(None, |
| 68 self.trUtf8("Proxy Configuration Error"), | 70 self.trUtf8("Proxy Configuration Error"), |
