Mercurial > hg > mercurial-source

diff mercurial/mail.py @ 39894:d2d89d31cbb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mail: convert encoding.encoding to sysstr
author Yuya Nishihara <yuya@tcha.org>
date Sun, 12 Aug 2018 12:16:08 +0900
parents c2327bb3505d
children 9b3be572ff0c
line wrap: on
line diff
--- a/mercurial/mail.py
+++ b/mercurial/mail.py
@@ -313,7 +313,7 @@
     try:
         acc, dom = addr.split('@')
         acc.decode('ascii')
-        dom = dom.decode(encoding.encoding).encode('idna')
+        dom = dom.decode(pycompat.sysstr(encoding.encoding)).encode('idna')
         addr = '%s@%s' % (acc, dom)
     except UnicodeDecodeError:
         raise error.Abort(_('invalid email address: %s') % addr)