Mercurial > public > mercurial-scm > hg-stable
diff mercurial/mail.py @ 9715:f0e99a2eac76
patchbomb: fix handling of email addresses with Unicode domains (IDNA)
dom.encode('idna') requires dom to be a Unicode string.
| author | Marti Raudsepp <marti@juffo.org> |
|---|---|
| date | Thu, 05 Nov 2009 10:49:28 +0100 |
| parents | 2de7d96593db |
| children | e5b44a7986d0 25e572394f5c |
line wrap: on
line diff
--- a/mercurial/mail.py Thu Nov 05 11:05:13 2009 +0100 +++ b/mercurial/mail.py Thu Nov 05 10:49:28 2009 +0100 @@ -169,7 +169,7 @@ try: acc, dom = addr.split('@') acc = acc.encode('ascii') - dom = dom.encode('idna') + dom = dom.decode(encoding.encoding).encode('idna') addr = '%s@%s' % (acc, dom) except UnicodeDecodeError: raise util.Abort(_('invalid email address: %s') % addr)