[FIX] import_data: backport of 6.1 fix for allowing non-ascii characters in import...

bzr revid: odo@openerp.com-20121003130055-7utq4fzd7i8eaayc

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 77bdb50..64d24c4 100644 (file)
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -879,7 +879,7 @@ class orm_template(object):
                      current_module, res, mode=mode, xml_id=xml_id,
                      noupdate=noupdate, res_id=res_id, context=context)
             except Exception, e:
-                return (-1, res, 'Line ' + str(position) +' : ' + str(e), '')
+                return (-1, res, 'Line ' + str(position) +' : ' + tools.ustr(e), '')
 
             if config.get('import_partial', False) and filename and (not (position%100)):
                 data = pickle.load(file(config.get('import_partial')))