Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/FtpReply.py
Helpviewer/Network/FtpReply.py
- changeset 2403
- e3d7a861547c
- parent 2302
- f29e9405c851
- child 2525
- 8b507a9a2d40
- child 3002
- 6ffc581f00f1
equal
deleted
inserted
replaced
| 2402:304fcefd3b04 | 2403:e3d7a861547c |
|---|---|
| 18 from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest, QAuthenticator | 18 from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest, QAuthenticator |
| 19 from PyQt4.QtWebKit import QWebSettings | 19 from PyQt4.QtWebKit import QWebSettings |
| 20 | 20 |
| 21 from E5Network.E5Ftp import E5Ftp, E5FtpProxyError, E5FtpProxyType | 21 from E5Network.E5Ftp import E5Ftp, E5FtpProxyError, E5FtpProxyType |
| 22 | 22 |
| 23 from UI.AuthenticationDialog import AuthenticationDialog | |
| 24 import UI.PixmapCache | 23 import UI.PixmapCache |
| 25 | 24 |
| 26 from Utilities.FtpUtilities import FtpDirLineParser, FtpDirLineParserError | 25 from Utilities.FtpUtilities import FtpDirLineParser, FtpDirLineParserError |
| 27 import Utilities | 26 import Utilities |
| 28 | 27 |
| 268 " instructions given by the proxy.\n{0}").format( | 267 " instructions given by the proxy.\n{0}").format( |
| 269 "\n".join(lines[1:]))) | 268 "\n".join(lines[1:]))) |
| 270 self.error.emit(QNetworkReply.ProxyConnectionRefusedError) | 269 self.error.emit(QNetworkReply.ProxyConnectionRefusedError) |
| 271 return False, False | 270 return False, False |
| 272 else: | 271 else: |
| 272 from UI.AuthenticationDialog import AuthenticationDialog | |
| 273 info = self.trUtf8("<b>Connect to proxy '{0}' using:</b>")\ | 273 info = self.trUtf8("<b>Connect to proxy '{0}' using:</b>")\ |
| 274 .format(Utilities.html_encode( | 274 .format(Utilities.html_encode( |
| 275 Preferences.getUI("ProxyHost/Ftp"))) | 275 Preferences.getUI("ProxyHost/Ftp"))) |
| 276 dlg = AuthenticationDialog(info, | 276 dlg = AuthenticationDialog(info, |
| 277 Preferences.getUI("ProxyUser/Ftp"), True) | 277 Preferences.getUI("ProxyUser/Ftp"), True) |
