Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/mail.py @ 39145: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
comparison
equal deleted inserted replaced
39144:c2327bb3505d 39145:d2d89d31cbb5
311 assert isinstance(addr, bytes) 311 assert isinstance(addr, bytes)
312 name = headencode(ui, name, charsets) 312 name = headencode(ui, name, charsets)
313 try: 313 try:
314 acc, dom = addr.split('@') 314 acc, dom = addr.split('@')
315 acc.decode('ascii') 315 acc.decode('ascii')
316 dom = dom.decode(encoding.encoding).encode('idna') 316 dom = dom.decode(pycompat.sysstr(encoding.encoding)).encode('idna')
317 addr = '%s@%s' % (acc, dom) 317 addr = '%s@%s' % (acc, dom)
318 except UnicodeDecodeError: 318 except UnicodeDecodeError:
319 raise error.Abort(_('invalid email address: %s') % addr) 319 raise error.Abort(_('invalid email address: %s') % addr)
320 except ValueError: 320 except ValueError:
321 try: 321 try: