diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/fetchmail/fetchmail.py | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 5cf8f85863d..2b652cd8a6b 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -20,6 +20,7 @@ ############################################################################## import logging +import poplib import time from imaplib import IMAP4 from imaplib import IMAP4_SSL @@ -41,6 +42,9 @@ from openerp.tools.translate import _ _logger = logging.getLogger(__name__) MAX_POP_MESSAGES = 50 +# Workaround for Python 2.7.8 bug https://bugs.python.org/issue23906 +poplib._MAXLINE = 65536 + class fetchmail_server(osv.osv): """Incoming POP/IMAP mail server account""" _name = 'fetchmail.server' diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index c77bda1e8f6..698940f2641 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -545,7 +545,7 @@ openerp.mail = function (session) { }; self.do_action(action, { - 'on_close': function(){ self.parent_thread.message_fetch() } + 'on_close': function(){ self.is_log && self.parent_thread.message_fetch() } }); self.on_cancel(); }); |