This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3836

patchbomb: use email.mime.base instead of email.MIMEBase
ClosedPublic

Authored by pulkit on Jun 25 2018, 4:45 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd17d1ee1d602: patchbomb: use email.mime.base instead of email.MIMEBase
Summary

The later was removed on Python 3.

On python 2:

email.MIMEBase.MIMEBase is email.mime.base.MIMEBase

True

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

pulkit created this revision.Jun 25 2018, 4:45 PM
Closed by commit rHGd17d1ee1d602: patchbomb: use email.mime.base instead of email.MIMEBase (authored by pulkit). · Explain WhyJun 26 2018, 8:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/patchbomb.py (3 lines)

Diff 9305

hgext/patchbomb.py

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.generator as emailgen import email.generator as emailgen
import email.mime.base as emimebase
import email.mime.multipart as emimemultipart import email.mime.multipart as emimemultipart
import email.utils as eutil import email.utils as eutil
import errno import errno
import os import os
import socket import socket
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
_charsets = mail._charsets(ui) _charsets = mail._charsets(ui)
subj = (opts.get(r'subject') subj = (opts.get(r'subject')
or prompt(ui, 'Subject:', 'A bundle for your repository')) or prompt(ui, 'Subject:', 'A bundle for your repository'))
body = _getdescription(repo, '', sender, **opts) body = _getdescription(repo, '', sender, **opts)
msg = emimemultipart.MIMEMultipart() msg = emimemultipart.MIMEMultipart()
if body: if body:
msg.attach(mail.mimeencode(ui, body, _charsets, opts.get(r'test'))) msg.attach(mail.mimeencode(ui, body, _charsets, opts.get(r'test')))
datapart = emailmod.MIMEBase.MIMEBase('application', 'x-mercurial-bundle') datapart = emimebase.MIMEBase('application', 'x-mercurial-bundle')
datapart.set_payload(bundle) datapart.set_payload(bundle)
bundlename = '%s.hg' % opts.get(r'bundlename', 'bundle') bundlename = '%s.hg' % opts.get(r'bundlename', 'bundle')
datapart.add_header('Content-Disposition', 'attachment', datapart.add_header('Content-Disposition', 'attachment',
filename=bundlename) filename=bundlename)
emailmod.Encoders.encode_base64(datapart) emailmod.Encoders.encode_base64(datapart)
msg.attach(datapart) msg.attach(datapart)
msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get(r'test')) msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get(r'test'))
return [(msg, subj, None)] return [(msg, subj, None)]