summaryrefslogtreecommitdiff
path: root/addons/fetchmail/fetchmail.py
diff options
context:
space:
mode:
authorphilubert@gmail.com <>2011-02-16 15:32:49 +1100
committerphilubert@gmail.com <>2011-02-16 15:32:49 +1100
commitb1af67b6f52523d0a7f18ebd44f3e5d6d7648124 (patch)
treef977de5dbabb8fba52231bfa257511542d5c4245 /addons/fetchmail/fetchmail.py
parentea447e0da0b5dd923ea17bde2d05ce782ef29b71 (diff)
parent5eb533a415f8e9738a81554cb4237597f1977485 (diff)
Did a merge from the parent branch.
bzr revid: philubert@gmail.com-20110216043249-1rgk002k9hjo7hu1
Diffstat (limited to 'addons/fetchmail/fetchmail.py')
-rw-r--r--addons/fetchmail/fetchmail.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index a1209492490..41f84cfdedd 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -28,6 +28,7 @@ from poplib import POP3_SSL
import netsvc
from osv import osv, fields
+import tools
logger = netsvc.Logger()
@@ -201,7 +202,7 @@ class email_server(osv.osv):
logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
except Exception, e:
- logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e))
+ logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))
return True