# HG changeset patch
# User Denis Laxalde <denis.laxalde@logilab.fr>
# Date 1565102626 -7200
# Node ID 1a5eb9a9f5b42fe7dd5f5fc38f3007a884d0a49d
# Parent  cc55093cc86d88b49b193a61dee5682f7c314db6# Parent  1b4e32301f143371ec17ae363bd7ff6c347fefa7
Merge with 3.26

diff -r cc55093cc86d -r 1a5eb9a9f5b4 .hgtags
--- a/.hgtags	Thu Aug 01 09:20:40 2019 +0200
+++ b/.hgtags	Tue Aug 06 16:43:46 2019 +0200
@@ -643,3 +643,5 @@
 4531a266f8b20fa6fd33df32453f77a0141856ae debian/3.26.12-1
 1fc684253207b7989ab25ed68468420185f28e59 debian/3.26.13-1
 1fc684253207b7989ab25ed68468420185f28e59 3.26.13
+172f683a84f6dbc069298bba811f590afb5e5a43 debian/3.26.14-1
+172f683a84f6dbc069298bba811f590afb5e5a43 3.26.14
diff -r cc55093cc86d -r 1a5eb9a9f5b4 cubicweb/__pkginfo__.py
diff -r cc55093cc86d -r 1a5eb9a9f5b4 cubicweb/cwconfig.py
--- a/cubicweb/cwconfig.py	Thu Aug 01 09:20:40 2019 +0200
+++ b/cubicweb/cwconfig.py	Tue Aug 06 16:43:46 2019 +0200
@@ -1248,7 +1248,7 @@
                 return False
             for msg, recipients in msgs:
                 try:
-                    smtp.sendmail(fromaddr, recipients, msg.as_string())
+                    smtp.sendmail(fromaddr, recipients, msg.as_bytes())
                 except Exception as ex:
                     self.exception("error sending mail to %s (%s)",
                                    recipients, ex)
diff -r cc55093cc86d -r 1a5eb9a9f5b4 cubicweb/devtools/testlib.py
--- a/cubicweb/devtools/testlib.py	Thu Aug 01 09:20:40 2019 +0200
+++ b/cubicweb/devtools/testlib.py	Tue Aug 06 16:43:46 2019 +0200
@@ -183,7 +183,7 @@
         pass
 
     def sendmail(self, fromaddr, recipients, msg):
-        MAILBOX.append(Email(fromaddr, recipients, msg))
+        MAILBOX.append(Email(fromaddr, recipients, msg.decode('utf-8')))
 
 
 cwconfig.SMTP = MockSMTP
diff -r cc55093cc86d -r 1a5eb9a9f5b4 debian/changelog
--- a/debian/changelog	Thu Aug 01 09:20:40 2019 +0200
+++ b/debian/changelog	Tue Aug 06 16:43:46 2019 +0200
@@ -35,6 +35,12 @@
 
  -- Denis Laxalde <denis.laxalde@logilab.fr>  Wed, 24 Jul 2019 16:08:43 +0200
 
+cubicweb (3.26.14-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Denis Laxalde <denis.laxalde@logilab.fr>  Tue, 06 Aug 2019 15:40:33 +0200
+
 cubicweb (3.26.13-1) unstable; urgency=medium
 
   [ Denis Laxalde ]