| durin42 |
| hg-reviewers |
We recently declared that all responses must be CBOR. So remove
support for sending a type that isn't CBOR data.
| Lint Skipped |
| Unit Tests Skipped |
| res.setbodybytes(_('command in frame must match command in URL')) | res.setbodybytes(_('command in frame must match command in URL')) | ||||
| return True | return True | ||||
| rsp = wireproto.dispatch(repo, proto, command['command']) | rsp = wireproto.dispatch(repo, proto, command['command']) | ||||
| res.status = b'200 OK' | res.status = b'200 OK' | ||||
| res.headers[b'Content-Type'] = FRAMINGTYPE | res.headers[b'Content-Type'] = FRAMINGTYPE | ||||
| if isinstance(rsp, wireprototypes.bytesresponse): | if isinstance(rsp, wireprototypes.cborresponse): | ||||
| action, meta = reactor.oncommandresponseready(outstream, | |||||
| command['requestid'], | |||||
| rsp.data) | |||||
| elif isinstance(rsp, wireprototypes.cborresponse): | |||||
| encoded = cbor.dumps(rsp.value, canonical=True) | encoded = cbor.dumps(rsp.value, canonical=True) | ||||
| action, meta = reactor.oncommandresponseready(outstream, | action, meta = reactor.oncommandresponseready(outstream, | ||||
| command['requestid'], | command['requestid'], | ||||
| encoded) | encoded) | ||||
| else: | else: | ||||
| action, meta = reactor.onservererror( | action, meta = reactor.onservererror( | ||||
| _('unhandled response type from wire proto command')) | _('unhandled response type from wire proto command')) | ||||