Mercurial Repositories > eric / file comparison
comparison: E5Network/E5Ftp.py
E5Network/E5Ftp.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3022
- 57179e4cdadd
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 274 raise E5FtpProxyError( | 274 raise E5FtpProxyError( |
| 275 "992 Proxy usage requested, but no proxy password" | 275 "992 Proxy usage requested, but no proxy password" |
| 276 " given") | 276 " given") |
| 277 | 277 |
| 278 if self.__proxyType in [E5FtpProxyType.NonAuthorizing, | 278 if self.__proxyType in [E5FtpProxyType.NonAuthorizing, |
| 279 E5FtpProxyType.AuthResp, E5FtpProxyType.Bluecoat]: | 279 E5FtpProxyType.AuthResp, |
| 280 E5FtpProxyType.Bluecoat]: | |
| 280 user += "@" + self.__host | 281 user += "@" + self.__host |
| 281 if self.__proxyType == E5FtpProxyType.Bluecoat: | 282 if self.__proxyType == E5FtpProxyType.Bluecoat: |
| 282 user += " " + self.__proxyUser | 283 user += " " + self.__proxyUser |
| 283 acct = self.__proxyPassword | 284 acct = self.__proxyPassword |
| 284 elif self.__proxyType == E5FtpProxyType.UserAtProxyuserAtServer: | 285 elif self.__proxyType == E5FtpProxyType.UserAtProxyuserAtServer: |
