summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2011-09-14 14:06:44 +0200
committerOlivier Dony <odo@openerp.com>2011-09-14 14:06:44 +0200
commit623bdb2c9f2c66c905dcb91ff99bc3d89453f491 (patch)
treeecd9d58a41a87d026d07f057f97d9971f7a6c0c1
parent8c17d421556dd12846a7d41c648eed5fad8d8759 (diff)
[FIX] ir.mail_server: care for non-ascii connection error message
bzr revid: odo@openerp.com-20110914120644-u0e2dmo2n146nl97
-rw-r--r--openerp/addons/base/ir/ir_mail_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 0701412043c..96fa9f52a88 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -189,7 +189,7 @@ class ir_mail_server(osv.osv):
password=smtp_server.smtp_pass, encryption=smtp_server.smtp_encryption,
smtp_debug=smtp_server.smtp_debug)
except Exception, e:
- raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % e)
+ raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e))
finally:
try:
if smtp: smtp.quit()