This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2453

py3: use email.utils module instead of email.Utils
ClosedPublic

Authored by pulkit on Feb 26 2018, 7:31 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG39c9f339b692: py3: use email.utils module instead of email.Utils
Summary

On py2:

import email
import email.utils as eutil
email.Utils.parseaddr is eutil.parseaddr

True

email.Utils.formatdate is eutil.formatdate

True

email.Utils is not present on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 26 2018, 7:31 AM
yuja requested changes to this revision.Feb 26 2018, 8:16 AM
yuja added a subscriber: yuja.
yuja added inline comments.
hgext/patchbomb.py
748

Perhaps it should be encoding.strfromlocal() because sender
is provided from user config or argument.

This revision now requires changes to proceed.Feb 26 2018, 8:16 AM
yuja accepted this revision.Feb 27 2018, 7:07 AM
This revision is now accepted and ready to land.Feb 27 2018, 7:07 AM
Closed by commit rHG39c9f339b692: py3: use email.utils module instead of email.Utils (authored by pulkit). · Explain WhyFeb 27 2018, 7:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/patchbomb.py (5 lines)

Diff 6108

hgext/patchbomb.py

flags)}" flags)}"
You can set patchbomb to always ask for confirmation by setting You can set patchbomb to always ask for confirmation by setting
``patchbomb.confirm`` to true. ``patchbomb.confirm`` to true.
''' '''
from __future__ import absolute_import from __future__ import absolute_import
import email as emailmod import email as emailmod
import email.utils as eutil
import errno import errno
import os import os
import socket import socket
import tempfile import tempfile
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
parent = opts.get('in_reply_to') or None parent = opts.get('in_reply_to') or None
# angle brackets may be omitted, they're not semantically part of the msg-id # angle brackets may be omitted, they're not semantically part of the msg-id
if parent is not None: if parent is not None:
if not parent.startswith('<'): if not parent.startswith('<'):
parent = '<' + parent parent = '<' + parent
if not parent.endswith('>'): if not parent.endswith('>'):
parent += '>' parent += '>'
sender_addr = emailmod.Utils.parseaddr(sender)[1] sender_addr = eutil.parseaddr(pycompat.sysstr(sender))[1]
yujaUnsubmitted
Not Done

Perhaps it should be encoding.strfromlocal() because sender
is provided from user config or argument.

yuja: Perhaps it should be `encoding.strfromlocal()` because `sender` is provided from user config or…
sender = mail.addressencode(ui, sender, _charsets, opts.get('test')) sender = mail.addressencode(ui, sender, _charsets, opts.get('test'))
sendmail = None sendmail = None
firstpatch = None firstpatch = None
for i, (m, subj, ds) in enumerate(msgs): for i, (m, subj, ds) in enumerate(msgs):
try: try:
m['Message-Id'] = genmsgid(m['X-Mercurial-Node']) m['Message-Id'] = genmsgid(m['X-Mercurial-Node'])
if not firstpatch: if not firstpatch:
firstpatch = m['Message-Id'] firstpatch = m['Message-Id']
m['X-Mercurial-Series-Id'] = firstpatch m['X-Mercurial-Series-Id'] = firstpatch
except TypeError: except TypeError:
m['Message-Id'] = genmsgid('patchbomb') m['Message-Id'] = genmsgid('patchbomb')
if parent: if parent:
m['In-Reply-To'] = parent m['In-Reply-To'] = parent
m['References'] = parent m['References'] = parent
if not parent or 'X-Mercurial-Node' not in m: if not parent or 'X-Mercurial-Node' not in m:
parent = m['Message-Id'] parent = m['Message-Id']
m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version() m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version()
m['Date'] = emailmod.Utils.formatdate(start_time[0], localtime=True) m['Date'] = eutil.formatdate(start_time[0], localtime=True)
start_time = (start_time[0] + 1, start_time[1]) start_time = (start_time[0] + 1, start_time[1])
m['From'] = sender m['From'] = sender
m['To'] = ', '.join(to) m['To'] = ', '.join(to)
if cc: if cc:
m['Cc'] = ', '.join(cc) m['Cc'] = ', '.join(cc)
if bcc: if bcc:
m['Bcc'] = ', '.join(bcc) m['Bcc'] = ', '.join(bcc)