[MERGE] forward port of branch 7.0 up to e0c1f54

2015-07-16 11:15:40 +02:00
parent 505e308cd6 e0c1f54fd7
commit f304fb7f06
2 changed files with 5 additions and 1 deletions
@@ -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'