This is an archive of the discontinued Mercurial Phabricator instance.

Differential D963

hgweb: in protocol adapter, look for bytes instances, not str
ClosedPublic

Authored by durin42 on Oct 5 2017, 5:31 PM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc23fa3103925: hgweb: in protocol adapter, look for bytes instances, not str
Summary

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

durin42 created this revision.Oct 5 2017, 5:31 PM
pulkit accepted this revision.Oct 5 2017, 7:09 PM
indygreg accepted this revision.Oct 6 2017, 9:35 AM
indygreg added a subscriber: indygreg.

FWIW, I've written extensions that have returned the wrong type and (previously silently) fell off this function. So yay for catching unicode return values!

This revision is now accepted and ready to land.Oct 6 2017, 9:35 AM
Closed by commit rHGc23fa3103925: hgweb: in protocol adapter, look for bytes instances, not str (authored by durin42). · Explain WhyOct 8 2017, 4:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/protocol.py (2 lines)

Diff 2524

mercurial/hgweb/protocol.py

if compress: if compress:
for chunk in engine.compressstream(gen, opts=engineopts): for chunk in engine.compressstream(gen, opts=engineopts):
yield chunk yield chunk
else: else:
for chunk in gen: for chunk in gen:
yield chunk yield chunk
rsp = wireproto.dispatch(repo, p, cmd) rsp = wireproto.dispatch(repo, p, cmd)
if isinstance(rsp, str): if isinstance(rsp, bytes):
req.respond(HTTP_OK, HGTYPE, body=rsp) req.respond(HTTP_OK, HGTYPE, body=rsp)
return [] return []
elif isinstance(rsp, wireproto.streamres): elif isinstance(rsp, wireproto.streamres):
if rsp.reader: if rsp.reader:
gen = iter(lambda: rsp.reader.read(32768), '') gen = iter(lambda: rsp.reader.read(32768), '')
else: else:
gen = rsp.gen gen = rsp.gen