Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: pass system string to email.message.Message.set_type()
authorGregory Szorc <gregory.szorc@gmail.com>
Sun, 11 Feb 2018 14:25:10 -0800
changeset 36047 1407c42b302c
parent 36046 a5cf79755eff
child 36048 194463554ba5
py3: pass system string to email.message.Message.set_type() Python 3 insists the type is a str. Differential Revision: https://phab.mercurial-scm.org/D2149
mercurial/mail.py file | annotate | diff | comparison | revisions 
--- a/mercurial/mail.py	Sun Feb 11 14:18:27 2018 -0800
+++ b/mercurial/mail.py	Sun Feb 11 14:25:10 2018 -0800
@@ -20,6 +20,7 @@
 from . import (
     encoding,
     error,
+    pycompat,
     sslutil,
     util,
 )
@@ -218,7 +219,7 @@
     '''
     cs = email.charset.Charset(charset)
     msg = email.message.Message()
-    msg.set_type('text/' + subtype)
+    msg.set_type(pycompat.sysstr('text/' + subtype))
 
     for line in body.splitlines():
         if len(line) > 950:
Mercurial