Patchwork D3836: patchbomb: use email.mime.base instead of email.MIMEBase

login
register
mail settings
Submitter phabricator
Date June 25, 2018, 8:45 p.m.
Message ID <differential-rev-PHID-DREV-emmig734dpluarlhlep6-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/32429/
State Superseded
Headers show

Comments

phabricator - June 25, 2018, 8:45 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The later was removed on Python 3.
  
  On python 2:
  
  >>> email.MIMEBase.MIMEBase is email.mime.base.MIMEBase
  
  True

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3836

AFFECTED FILES
  hgext/patchbomb.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -75,6 +75,7 @@ 
 
 import email as emailmod
 import email.generator as emailgen
+import email.mime.base as emimebase
 import email.mime.multipart as emimemultipart
 import email.utils as eutil
 import errno
@@ -369,7 +370,7 @@ 
     msg = emimemultipart.MIMEMultipart()
     if body:
         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)
     bundlename = '%s.hg' % opts.get(r'bundlename', 'bundle')
     datapart.add_header('Content-Disposition', 'attachment',