This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2168

mail: import email.utils not email.Utils
ClosedPublic

Authored by indygreg on Feb 11 2018, 10:45 PM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHG54dfb65e2f82: mail: import email.utils not email.Utils
Summary

email.Utils was renamed to email.utils in Python 2.5. But it appears
at some point before Python 2.7 (possibly 2.5) email.Utils was aliased
to the new home. So email.utils should be safe for all versions of
Python we support.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 11 2018, 10:45 PM
pulkit accepted this revision.Feb 12 2018, 2:43 AM
durin42 accepted this revision.Feb 12 2018, 9:31 PM
This revision is now accepted and ready to land.Feb 12 2018, 9:31 PM
Closed by commit rHG54dfb65e2f82: mail: import email.utils not email.Utils (authored by indygreg). · Explain WhyFeb 12 2018, 9:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (6 lines)

Diff 5591

mercurial/mail.py

except UnicodeDecodeError: except UnicodeDecodeError:
raise error.Abort(_('invalid email address: %s') % addr) raise error.Abort(_('invalid email address: %s') % addr)
except ValueError: except ValueError:
try: try:
# too strict? # too strict?
addr = addr.encode('ascii') addr = addr.encode('ascii')
except UnicodeDecodeError: except UnicodeDecodeError:
raise error.Abort(_('invalid local address: %s') % addr) raise error.Abort(_('invalid local address: %s') % addr)
return email.Utils.formataddr((name, addr)) return email.utils.formataddr((name, addr))
def addressencode(ui, address, charsets=None, display=False): def addressencode(ui, address, charsets=None, display=False):
'''Turns address into RFC-2047 compliant header.''' '''Turns address into RFC-2047 compliant header.'''
if display or not address: if display or not address:
return address or '' return address or ''
name, addr = email.Utils.parseaddr(address) name, addr = email.utils.parseaddr(address)
return _addressencode(ui, name, addr, charsets) return _addressencode(ui, name, addr, charsets)
def addrlistencode(ui, addrs, charsets=None, display=False): def addrlistencode(ui, addrs, charsets=None, display=False):
'''Turns a list of addresses into a list of RFC-2047 compliant headers. '''Turns a list of addresses into a list of RFC-2047 compliant headers.
A single element of input list may contain multiple addresses, but output A single element of input list may contain multiple addresses, but output
always has one address per item''' always has one address per item'''
if display: if display:
return [a.strip() for a in addrs if a.strip()] return [a.strip() for a in addrs if a.strip()]
result = [] result = []
for name, addr in email.Utils.getaddresses(addrs): for name, addr in email.utils.getaddresses(addrs):
if name or addr: if name or addr:
result.append(_addressencode(ui, name, addr, charsets)) result.append(_addressencode(ui, name, addr, charsets))
return result return result
def mimeencode(ui, s, charsets=None, display=False): def mimeencode(ui, s, charsets=None, display=False):
'''creates mime text object, encodes it if needed, and sets '''creates mime text object, encodes it if needed, and sets
charset and transfer-encoding accordingly.''' charset and transfer-encoding accordingly.'''
cs = 'us-ascii' cs = 'us-ascii'