summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/Ftp.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-12-20 14:24:13 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-12-20 14:24:13 +0100
commit6325eda4e8c142edd11c747f7a9d4a3fa975c494 (patch)
tree589819bb5e5ce441ea8f1109c8357c086816ed69 /module/plugins/hoster/Ftp.py
parent[AlldebridCom] Syntax fixup (diff)
downloadpyload-6325eda4e8c142edd11c747f7a9d4a3fa975c494.tar.xz
Fix password retrieving in some plugins
Diffstat (limited to 'module/plugins/hoster/Ftp.py')
-rw-r--r--module/plugins/hoster/Ftp.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py
index 9f79d80b5..c6ad68e49 100644
--- a/module/plugins/hoster/Ftp.py
+++ b/module/plugins/hoster/Ftp.py
@@ -12,7 +12,7 @@ from module.plugins.Hoster import Hoster
class Ftp(Hoster):
__name__ = "Ftp"
__type__ = "hoster"
- __version__ = "0.43"
+ __version__ = "0.44"
__pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
@@ -45,10 +45,9 @@ class Ftp(Hoster):
self.logDebug("Logging on to %s" % netloc)
self.req.addAuth(self.account.accounts[netloc]['password'])
else:
- for pwd in self.getPassword().splitlines():
- if ":" in pwd:
- self.req.addAuth(pwd.strip())
- break
+ pwd = self.getPassword()
+ if ':' in pwd:
+ self.req.addAuth(pwd)
self.req.http.c.setopt(pycurl.NOBODY, 1)