diff options
| author | Olivier Dony <odo@openerp.com> | 2015-09-30 00:01:00 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-09-30 02:53:59 +0200 |
| commit | af4a60b9419ea8c9ab30f6b930a59469a57f8724 (patch) | |
| tree | 4c4c18e03f41478bc9e2f2256e0cea4182046de4 /addons/base_import_module/models | |
| parent | 9a9012064c72d61d444a275e4c5fe54bd3500c2c (diff) | |
| parent | 26d0fe6d9f645ec128182bb2f4f8b9808ad05004 (diff) | |
[MERGE] Forward-port 8.0 up to rev. 26d0fe6d9f645ec128182bb2f4f8b9808ad05004
Diffstat (limited to 'addons/base_import_module/models')
| -rw-r--r-- | addons/base_import_module/models/ir_module.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index 3e35de2b0a1..cbaaa77bd38 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -6,7 +6,7 @@ from os.path import join as opj import openerp from openerp.osv import osv -from openerp.tools import convert_file +from openerp.tools import convert_file, exception_to_unicode from openerp.tools.translate import _ from openerp.exceptions import UserError @@ -102,7 +102,7 @@ class view(osv.osv): self.import_module(cr, uid, mod_name, path, force=force, context=context) success.append(mod_name) except Exception, e: - errors[mod_name] = str(e) + errors[mod_name] = exception_to_unicode(e) r = ["Successfully imported module '%s'" % mod for mod in success] for mod, error in errors.items(): r.append("Error while importing module '%s': %r" % (mod, error)) |
