( )⚙ D12286 mail: delete conditional code for Python 2

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12286

mail: delete conditional code for Python 2
ClosedPublic

Authored by indygreg on Mar 2 2022, 6:30 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf0c445a8e324: mail: delete conditional code for Python 2

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Mar 2 2022, 6:30 PM
Alphare accepted this revision.Mar 3 2022, 4:57 AM
This revision is now accepted and ready to land.Mar 3 2022, 4:57 AM
indygreg updated this revision to Diff 32463.Mar 3 2022, 11:09 AM
indygreg added a commit: rHGf0c445a8e324: mail: delete conditional code for Python 2.Mar 3 2022, 11:52 AM
Closed by commit rHGf0c445a8e324: mail: delete conditional code for Python 2 (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (51 lines)

Diff 32463

mercurial/mail.py

"""creates mime text object, encodes it if needed, and sets """creates mime text object, encodes it if needed, and sets
charset and transfer-encoding accordingly.""" charset and transfer-encoding accordingly."""
cs = 'us-ascii' cs = 'us-ascii'
if not display: if not display:
s, cs = _encode(ui, s, charsets) s, cs = _encode(ui, s, charsets)
return mimetextqp(s, 'plain', cs) return mimetextqp(s, 'plain', cs)
if pycompat.ispy3:
Generator = email.generator.BytesGenerator Generator = email.generator.BytesGenerator
def parse(fp): def parse(fp):
# type: (Any) -> email.message.Message # type: (Any) -> email.message.Message
ep = email.parser.Parser() ep = email.parser.Parser()
# disable the "universal newlines" mode, which isn't binary safe. # disable the "universal newlines" mode, which isn't binary safe.
# I have no idea if ascii/surrogateescape is correct, but that's # I have no idea if ascii/surrogateescape is correct, but that's
# what the standard Python email parser does. # what the standard Python email parser does.
fp = io.TextIOWrapper( fp = io.TextIOWrapper(
fp, encoding='ascii', errors='surrogateescape', newline=chr(10) fp, encoding='ascii', errors='surrogateescape', newline=chr(10)
) )
try: try:
return ep.parse(fp) return ep.parse(fp)
finally: finally:
fp.detach() fp.detach()
def parsebytes(data): def parsebytes(data):
# type: (bytes) -> email.message.Message # type: (bytes) -> email.message.Message
ep = email.parser.BytesParser() ep = email.parser.BytesParser()
return ep.parsebytes(data) return ep.parsebytes(data)
else:
Generator = email.generator.Generator
def parse(fp):
# type: (Any) -> email.message.Message
ep = email.parser.Parser()
return ep.parse(fp)
def parsebytes(data):
# type: (str) -> email.message.Message
ep = email.parser.Parser()
return ep.parsestr(data)
def headdecode(s): def headdecode(s):
# type: (Union[email.header.Header, bytes]) -> bytes # type: (Union[email.header.Header, bytes]) -> bytes
'''Decodes RFC-2047 header''' '''Decodes RFC-2047 header'''
uparts = [] uparts = []
for part, charset in email.header.decode_header(s): for part, charset in email.header.decode_header(s):
if charset is not None: if charset is not None:
try: try:
uparts.append(part.decode(charset)) uparts.append(part.decode(charset))