This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2167

py3: cast character set to bytes
ClosedPublic

Authored by indygreg on Feb 11 2018, 10:45 PM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHG6ea7f1c10c81: py3: cast character set to bytes
Summary

The returned value from this function is eventually fed into
email.charset.Charset.init. However, the standard library
appears to handle both string types in Python 2 and 3. So there
shouldn't be any problem returning a bytes here.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 11 2018, 10:45 PM
pulkit accepted this revision.Feb 12 2018, 2:43 AM
durin42 accepted this revision.Feb 12 2018, 9:31 PM
This revision is now accepted and ready to land.Feb 12 2018, 9:31 PM
Closed by commit rHG6ea7f1c10c81: py3: cast character set to bytes (authored by indygreg). · Explain WhyFeb 12 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (2 lines)

Diff 5468

mercurial/mail.py

'but no smtp host configured')) 'but no smtp host configured'))
else: else:
if not util.findexe(method): if not util.findexe(method):
raise error.Abort(_('%r specified as email transport, ' raise error.Abort(_('%r specified as email transport, '
'but not in PATH') % method) 'but not in PATH') % method)
def codec2iana(cs): def codec2iana(cs):
'''''' ''''''
cs = email.charset.Charset(cs).input_charset.lower() cs = pycompat.sysbytes(email.charset.Charset(cs).input_charset.lower())
# "latin1" normalizes to "iso8859-1", standard calls for "iso-8859-1" # "latin1" normalizes to "iso8859-1", standard calls for "iso-8859-1"
if cs.startswith("iso") and not cs.startswith("iso-"): if cs.startswith("iso") and not cs.startswith("iso-"):
return "iso-" + cs[3:] return "iso-" + cs[3:]
return cs return cs
def mimetextpatch(s, subtype='plain', display=False): def mimetextpatch(s, subtype='plain', display=False):
'''Return MIME message suitable for a patch. '''Return MIME message suitable for a patch.