--- a/cubicweb/cwconfig.py Wed Jul 24 13:39:52 2019 +0200
+++ b/cubicweb/cwconfig.py Tue Aug 06 14:26:17 2019 +0200
@@ -192,7 +192,7 @@
from threading import Lock
from warnings import filterwarnings
-from six import text_type
+from six import PY2, text_type
from logilab.common.decorators import cached, classproperty
from logilab.common.deprecation import deprecated
@@ -1344,9 +1344,10 @@
if self.mode == 'test':
raise
return False
- for msg, recipients in msgs:
+ for mimedoc, recipients in msgs:
+ msg = mimedoc.as_string() if PY2 else mimedoc.as_bytes()
try:
- smtp.sendmail(fromaddr, recipients, msg.as_string())
+ smtp.sendmail(fromaddr, recipients, msg)
except Exception as ex:
self.exception("error sending mail to %s (%s)",
recipients, ex)