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.
mail: fix a bad return type in _encode()
authorDenis Laxalde <denis.laxalde@logilab.fr>
Tue, 12 Nov 2019 17:12:16 +0100
changeset 43624 849a3f81f46c
parent 43623 94eac340d212
child 43625 8d9e2c2b6058
mail: fix a bad return type in _encode() This particular instruction returned only a string and omitted the charset value.
mercurial/mail.py file | annotate | diff | comparison | revisions 
--- a/mercurial/mail.py	Mon Nov 11 18:55:42 2019 -0800
+++ b/mercurial/mail.py	Tue Nov 12 17:12:16 2019 +0100
@@ -336,7 +336,7 @@
                 ui.warn(_(b'ignoring invalid sendcharset: %s\n') % ocs)
         else:
             # Everything failed, ascii-armor what we've got and send it.
-            return s.encode('ascii', 'backslashreplace')
+            return s.encode('ascii', 'backslashreplace'), b'us-ascii'
     # We have a bytes of unknown encoding. We'll try and guess a valid
     # encoding, falling back to pretending we had ascii even though we
     # know that's wrong.
Mercurial