This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5714

mail: document behavior of Python 3
ClosedPublic

Authored by indygreg on Jan 26 2019, 2:43 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9b3be572ff0c: mail: document behavior of Python 3
Summary

test-notify.t (and possibly other tests) are failing on Python 3
because email.message.Message is now aware of encodings and
attempts to roundtrip values with the specified message encoding.

Python 2 doesn't perform this roundtripping. We have tests with
non-ascii data being serialized to a message that claims to use
ascii encoding.

I /think/ Mercurial's behavior may be buggy here. But I'm not
sure.

I'm documenting the behavior so the next person who looks into
this doesn't start from scratch like I did.

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.Jan 26 2019, 2:43 PM
pulkit accepted this revision.Jan 26 2019, 4:32 PM
Closed by commit rHG9b3be572ff0c: mail: document behavior of Python 3 (authored by indygreg). · Explain WhyJan 26 2019, 4:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (7 lines)

Diff 13514

mercurial/mail.py

msg = email.message.Message() msg = email.message.Message()
msg.set_type(pycompat.sysstr('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
# On Python 2, this simply assigns a value. Python 3 inspects
# body and does different things depending on whether it has
# encode() or decode() attributes. We can get the old behavior
# if we pass a str and charset is None and we call set_charset().
# But we may get into trouble later due to Python attempting to
# encode/decode using the registered charset (or attempting to
# use ascii in the absence of a charset).
msg.set_payload(body, cs) msg.set_payload(body, cs)
return msg return msg
def _charsets(ui): def _charsets(ui):
'''Obtains charsets to send mail parts not containing patches.''' '''Obtains charsets to send mail parts not containing patches.'''
charsets = [cs.lower() for cs in ui.configlist('email', 'charsets')] charsets = [cs.lower() for cs in ui.configlist('email', 'charsets')]
fallbacks = [encoding.fallbackencoding.lower(), fallbacks = [encoding.fallbackencoding.lower(),