This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2136

py3: convert content-type to bytes
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG95791b275b73: py3: convert content-type to bytes
Summary

This fixes the exception:

TypeError: %b requires a bytes-like object, or an object that
implements __bytes__, not 'str'

On the line:

ui.debug('Content-Type: %s\n' % content_type)

And it prevents additional exceptions that use the content_type
variable later.

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 rHG95791b275b73: py3: convert content-type to bytes (authored by indygreg). · Explain WhyFeb 11 2018, 8:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (2 lines)

Diff 5437

mercurial/patch.py

subject = re.sub(br'\n[ \t]+', ' ', subject) subject = re.sub(br'\n[ \t]+', ' ', subject)
ui.debug('Subject: %s\n' % subject) ui.debug('Subject: %s\n' % subject)
if data['user']: if data['user']:
ui.debug('From: %s\n' % data['user']) ui.debug('From: %s\n' % data['user'])
diffs_seen = 0 diffs_seen = 0
ok_types = ('text/plain', 'text/x-diff', 'text/x-patch') ok_types = ('text/plain', 'text/x-diff', 'text/x-patch')
message = '' message = ''
for part in msg.walk(): for part in msg.walk():
content_type = part.get_content_type() content_type = pycompat.bytestr(part.get_content_type())
ui.debug('Content-Type: %s\n' % content_type) ui.debug('Content-Type: %s\n' % content_type)
if content_type not in ok_types: if content_type not in ok_types:
continue continue
payload = part.get_payload(decode=True) payload = part.get_payload(decode=True)
m = diffre.search(payload) m = diffre.search(payload)
if m: if m:
hgpatch = False hgpatch = False
hgpatchheader = False hgpatchheader = False