This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2149

py3: pass system string to email.message.Message.set_type()
ClosedPublic

Authored by indygreg on Feb 11 2018, 5:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1407c42b302c: py3: pass system string to email.message.Message.set_type()
Summary

Python 3 insists the type is a str.

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, 5:57 PM
Closed by commit rHG1407c42b302c: py3: pass system string to email.message.Message.set_type() (authored by indygreg). · Explain WhyFeb 11 2018, 8:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (3 lines)

Diff 5448

mercurial/mail.py

import smtplib import smtplib
import socket import socket
import time import time
from .i18n import _ from .i18n import _
from . import ( from . import (
encoding, encoding,
error, error,
pycompat,
sslutil, sslutil,
util, util,
) )
class STARTTLS(smtplib.SMTP): class STARTTLS(smtplib.SMTP):
'''Derived class to verify the peer certificate for STARTTLS. '''Derived class to verify the peer certificate for STARTTLS.
This class allows to pass any keyword arguments to SSL socket creation. This class allows to pass any keyword arguments to SSL socket creation.
return mimetextqp(s, subtype, "iso-8859-1") return mimetextqp(s, subtype, "iso-8859-1")
def mimetextqp(body, subtype, charset): def mimetextqp(body, subtype, charset):
'''Return MIME message. '''Return MIME message.
Quoted-printable transfer encoding will be used if necessary. Quoted-printable transfer encoding will be used if necessary.
''' '''
cs = email.charset.Charset(charset) cs = email.charset.Charset(charset)
msg = email.message.Message() msg = email.message.Message()
msg.set_type('text/' + subtype) msg.set_type(pycompat.sysstr('text/' + subtype))
for line in body.splitlines(): for line in body.splitlines():
if len(line) > 950: if len(line) > 950:
cs.body_encoding = email.charset.QP cs.body_encoding = email.charset.QP
break break
msg.set_payload(body, cs) msg.set_payload(body, cs)