--- a/mercurial/mail.py	Sun Aug 12 12:14:28 2018 +0900
+++ b/mercurial/mail.py	Sun Aug 12 12:16:08 2018 +0900
@@ -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)