Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/FtpReply.py
Helpviewer/Network/FtpReply.py
- changeset 2054
- 099993935e6d
- parent 2053
- ef81185e8b89
- child 2074
- 5cb87968aad5
equal
deleted
inserted
replaced
| 2053:ef81185e8b89 | 2054:099993935e6d |
|---|---|
| 194 username = self.url().userName() | 194 username = self.url().userName() |
| 195 password = self.url().password() | 195 password = self.url().password() |
| 196 byAuth = False | 196 byAuth = False |
| 197 while retry: | 197 while retry: |
| 198 if self.__proxy: | 198 if self.__proxy: |
| 199 self.__ftp.connect(self.__proxy.hostName(), self.__proxy.port()) | 199 self.__ftp.connect(self.__proxy.hostName(), self.__proxy.port(), |
| 200 timeout=10) | |
| 200 else: | 201 else: |
| 201 self.__ftp.connect( | 202 self.__ftp.connect( |
| 202 self.url().host(), self.url().port(ftplib.FTP_PORT), timeout=10) | 203 self.url().host(), self.url().port(ftplib.FTP_PORT), timeout=10) |
| 203 ok, retry = self.__doFtpLogin(username, password, byAuth) | 204 ok, retry = self.__doFtpLogin(username, password, byAuth) |
| 204 if not ok and retry: | 205 if not ok and retry: |
