--- a/mercurial/mail.py	Wed Nov 06 15:12:13 2019 -0500
+++ b/mercurial/mail.py	Wed Nov 06 15:34:40 2019 -0500
@@ -279,7 +279,9 @@
     '''Return MIME message.
     Quoted-printable transfer encoding will be used if necessary.
     '''
-    cs = email.charset.Charset(charset)
+    # Experimentally charset is okay as a bytes even if the type
+    # stubs disagree.
+    cs = email.charset.Charset(charset)  # pytype: disable=wrong-arg-types
     msg = email.message.Message()
     msg.set_type(pycompat.sysstr(b'text/' + subtype))