Helpviewer/Network/FtpReply.py

changeset 2082
5d72ca2fbeab
parent 2080
4b33165dd55b
child 2302
f29e9405c851
--- a/Helpviewer/Network/FtpReply.py	Sun Sep 30 19:08:45 2012 +0200
+++ b/Helpviewer/Network/FtpReply.py	Mon Oct 01 18:36:46 2012 +0200
@@ -285,7 +285,7 @@
                             self.__ftp.setProxyAuthentication(username, password)
                             return False, True
             return False, False
-        except ftplib.error_perm as err:
+        except (ftplib.error_perm, ftplib.error_temp) as err:
             code = err.args[0].strip()[:3]
             if code in ["530", "421"]:
                 # error 530 -> Login incorrect
@@ -297,7 +297,6 @@
                     auth = self.__handler.getAuthenticator(self.url().host())
                 if not auth or auth.isNull() or not auth.user():
                     auth = QAuthenticator()
-                    auth.setOption("realm", self.url().host())
                     self.__manager.authenticationRequired.emit(self, auth)
                     if not auth.isNull():
                         if auth.user():

eric ide

mercurial