This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2166

py3: cast decode() argument to system string
ClosedPublic

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

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHG9e47bfbeb723: py3: cast decode() argument to system string
Summary

The actual types here may be mixed due to string literals
and variables from other modules. So a cast is necessary.

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, 10:45 PM
pulkit accepted this revision.Feb 12 2018, 2:41 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 rHG9e47bfbeb723: py3: cast decode() argument to system string (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 5589

mercurial/mail.py

ISO-8859-1, an encoding with that allows all byte sequences. ISO-8859-1, an encoding with that allows all byte sequences.
Transfer encodings will be used if necessary.''' Transfer encodings will be used if necessary.'''
cs = ['us-ascii', 'utf-8', encoding.encoding, encoding.fallbackencoding] cs = ['us-ascii', 'utf-8', encoding.encoding, encoding.fallbackencoding]
if display: if display:
return mimetextqp(s, subtype, 'us-ascii') return mimetextqp(s, subtype, 'us-ascii')
for charset in cs: for charset in cs:
try: try:
s.decode(charset) s.decode(pycompat.sysstr(charset))
return mimetextqp(s, subtype, codec2iana(charset)) return mimetextqp(s, subtype, codec2iana(charset))
except UnicodeDecodeError: except UnicodeDecodeError:
pass pass
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.