diff options
| author | Xavier Morel <xmo@odoo.com> | 2017-06-26 17:23:56 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2017-06-26 17:23:56 +0200 |
| commit | 6501184e6294ffb06e24a0ec8e9666b79a80b59a (patch) | |
| tree | 672e8ae84e1168dc154f9aaf4093a17d4b2126c2 /addons | |
| parent | 252d65dc23204feb69197f6e19955f20eb6970cd (diff) | |
| parent | 5ee9ec7d6c5608ad75c63852557244ae65547c25 (diff) | |
[FIX] P3: API changes
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/models/mail_thread.py | 5 | ||||
| -rwxr-xr-x | addons/mail/static/scripts/openerp_mailgate.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index b07adf60608..ebe11eb09d9 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -13,7 +13,10 @@ import pytz import re import socket import time -import xmlrpclib +try: + from xmlrpc import client as xmlrpclib +except ImportError: + import xmlrpclib from collections import namedtuple from email.message import Message diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py index aed6db0681f..7ad0901ef22 100755 --- a/addons/mail/static/scripts/openerp_mailgate.py +++ b/addons/mail/static/scripts/openerp_mailgate.py @@ -9,7 +9,10 @@ import cgitb import time import optparse import sys -import xmlrpclib +try: + from xmlrpc import client as xmlrpclib +except ImportError: + import xmlrpclib import smtplib from email.mime.multipart import MIMEMultipart from email.mime.base import MIMEBase |