diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
| commit | 2dbe4a696ecd7330b16d10ec38462fe6c8fa37ca (patch) | |
| tree | e7f1103c8b839aa1bffee9dfb961e08b3bc82e26 /addons/base_crypt/crypt.py | |
| parent | 6d2a0d270f0f0b9eb7d66eb384a8803a186db374 (diff) | |
| parent | 73980eba5f64c674b0bc366c714a9a38d3bb915a (diff) | |
[MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
Diffstat (limited to 'addons/base_crypt/crypt.py')
| -rw-r--r-- | addons/base_crypt/crypt.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py index 14e029eb988..45e6b396222 100644 --- a/addons/base_crypt/crypt.py +++ b/addons/base_crypt/crypt.py @@ -38,10 +38,10 @@ from random import seed, sample from string import ascii_letters, digits -from osv import fields,osv -import pooler -from tools.translate import _ -from service import security +from openerp.osv import fields,osv +from openerp import pooler +from openerp.tools.translate import _ +from openerp.service import security import logging magic_md5 = '$1$' |