Mercurial Repositories > eric / file comparison
comparison: E5Network/E5NetworkProxyFactory.py
E5Network/E5NetworkProxyFactory.py
- branch
- 5_1_x
- changeset 1361
- 39631c724b05
- parent 1060
- e56185898d97
- child 1510
- e75ecf2bd9dd
equal
deleted
inserted
replaced
| 1359:97dc4ee2d655 | 1361:39631c724b05 |
|---|---|
| 82 if query.queryType() == QNetworkProxyQuery.UrlRequest and \ | 82 if query.queryType() == QNetworkProxyQuery.UrlRequest and \ |
| 83 query.protocolTag() in ["http", "https", "ftp"] and \ | 83 query.protocolTag() in ["http", "https", "ftp"] and \ |
| 84 Preferences.getUI("UseProxy"): | 84 Preferences.getUI("UseProxy"): |
| 85 if Preferences.getUI("UseSystemProxy"): | 85 if Preferences.getUI("UseSystemProxy"): |
| 86 proxyList = QNetworkProxyFactory.systemProxyForQuery(query) | 86 proxyList = QNetworkProxyFactory.systemProxyForQuery(query) |
| 87 if (not Globals.isWindowsPlatform() and \ | 87 if not Globals.isWindowsPlatform() and \ |
| 88 not Globals.isMacPlatform()) and \ | |
| 89 len(proxyList) == 1 and \ | 88 len(proxyList) == 1 and \ |
| 90 proxyList[0].type() == QNetworkProxy.NoProxy: | 89 proxyList[0].type() == QNetworkProxy.NoProxy: |
| 91 # try it the Python way | 90 # try it the Python way |
| 92 # scan the environment for variables named <scheme>_proxy | 91 # scan the environment for variables named <scheme>_proxy |
| 93 # scan over whole environment to make this case insensitive | 92 # scan over whole environment to make this case insensitive |
