[MERGE] fix undefined get_db_only in ftp and webdav by sbh

[odoo/odoo.git] / addons / document_ftp / test_easyftp.py

diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index eb709c7..ac2cd72 100644 (file)
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -25,20 +25,24 @@
 """
 
 from ftplib import FTP
-from tools.misc import detect_ip_addr
 from tools import config
 
-def get_plain_ftp():
+def get_plain_ftp(timeout=10.0):
     ftp = FTP()
     host = config.get('ftp_server_host', '127.0.0.1')
-    port = config.get('ftp_server_port','8021')
-    ftp.connect(host,port)
+    port = config.get('ftp_server_port', '8021')
+    ftp.connect(host, port,timeout)
     return ftp
 
 def get_ftp_login(cr, uid, ormobj):
     ftp = get_plain_ftp()
     user = ormobj.pool.get('res.users').read(cr, uid, uid)
-    ftp.login(user.get('login',''),user.get('password',''))
+    passwd = user.get('password','')
+    if passwd.startswith("$1$"):
+        # md5 by base crypt. We cannot decode, wild guess 
+        # that passwd = login
+        passwd = user.get('login', '')
+    ftp.login(user.get('login',''), passwd)
     ftp.cwd("/" + cr.dbname)
     return ftp
 
@@ -63,4 +67,4 @@ def get_ftp_fulldata(ftp, fname, limit=8192):
     ftp.retrbinary('RETR %s' % fname, partial(ffp,data))
     return ''.join(data)
 
-#eof
\ No newline at end of file
+#eof