diff options
| author | DBR (OpenERP) <dbr@tinyerp.com> | 2011-09-20 12:15:50 +0530 |
|---|---|---|
| committer | DBR (OpenERP) <dbr@tinyerp.com> | 2011-09-20 12:15:50 +0530 |
| commit | fa577c8a15ad327d77d4e9e24d5e0ea27ca3e613 (patch) | |
| tree | 96cfa22a87945b37b853b3e10b3a0f1944204666 /addons/document_ftp/test_easyftp.py | |
| parent | 2380552cb493040b22e61f8e4209cc6df8edc912 (diff) | |
| parent | f2f072e2e3c9a273a050d6f2277beb64b1671e18 (diff) | |
[Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20110920064550-v90yjoblpzp5ebiq
Diffstat (limited to 'addons/document_ftp/test_easyftp.py')
| -rw-r--r-- | addons/document_ftp/test_easyftp.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py index ac2cd722478..74890b1a333 100644 --- a/addons/document_ftp/test_easyftp.py +++ b/addons/document_ftp/test_easyftp.py @@ -36,13 +36,13 @@ def get_plain_ftp(timeout=10.0): def get_ftp_login(cr, uid, ormobj): ftp = get_plain_ftp() - user = ormobj.pool.get('res.users').read(cr, uid, uid) - passwd = user.get('password','') + user = ormobj.pool.get('res.users').browse(cr, uid, uid) + passwd = user.password or '' if passwd.startswith("$1$"): - # md5 by base crypt. We cannot decode, wild guess + # md5 by base crypt. We cannot decode, wild guess # that passwd = login - passwd = user.get('login', '') - ftp.login(user.get('login',''), passwd) + passwd = user.login + ftp.login(user.login, passwd) ftp.cwd("/" + cr.dbname) return ftp |