This is an archive of the discontinued Mercurial Phabricator instance.

Differential D969

request: coerce content-type to native str
ClosedPublic

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

Details

Reviewers
quark
indygreg
Group Reviewers
hg-reviewers
Commits
rHG528b21b853aa: request: coerce content-type to native str
rHG08ebcbc423f3: request: coerce content-type to native str
rHGfc21a3513062: request: coerce content-type to native str
Summary

Again, required by WSGI.

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:32 PM
quark accepted this revision.Oct 5 2017, 10:00 PM
indygreg accepted this revision.Oct 6 2017, 9:47 AM
indygreg added a subscriber: indygreg.

Passing in the appropriate type from all callers is probably better. But this is simpler.

This revision is now accepted and ready to land.Oct 6 2017, 9:47 AM
Closed by commit rHGfc21a3513062: request: coerce content-type to native str (authored by durin42). · Explain WhyOct 8 2017, 4:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/request.py (3 lines)

Diff 2530

mercurial/hgweb/request.py

from .common import ( from .common import (
ErrorResponse, ErrorResponse,
HTTP_NOT_MODIFIED, HTTP_NOT_MODIFIED,
statusmessage, statusmessage,
) )
from .. import ( from .. import (
pycompat,
util, util,
) )
shortcuts = { shortcuts = {
'cl': [('cmd', ['changelog']), ('rev', None)], 'cl': [('cmd', ['changelog']), ('rev', None)],
'sl': [('cmd', ['shortlog']), ('rev', None)], 'sl': [('cmd', ['shortlog']), ('rev', None)],
'cs': [('cmd', ['changeset']), ('node', None)], 'cs': [('cmd', ['changeset']), ('node', None)],
'f': [('cmd', ['file']), ('filenode', None)], 'f': [('cmd', ['file']), ('filenode', None)],
def drain(self): def drain(self):
'''need to read all data from request, httplib is half-duplex''' '''need to read all data from request, httplib is half-duplex'''
length = int(self.env.get('CONTENT_LENGTH') or 0) length = int(self.env.get('CONTENT_LENGTH') or 0)
for s in util.filechunkiter(self.inp, limit=length): for s in util.filechunkiter(self.inp, limit=length):
pass pass
def respond(self, status, type, filename=None, body=None): def respond(self, status, type, filename=None, body=None):
if not isinstance(type, str):
type = pycompat.sysstr(type)
if self._start_response is not None: if self._start_response is not None:
self.headers.append(('Content-Type', type)) self.headers.append(('Content-Type', type))
if filename: if filename:
filename = (filename.rpartition('/')[-1] filename = (filename.rpartition('/')[-1]
.replace('\\', '\\\\').replace('"', '\\"')) .replace('\\', '\\\\').replace('"', '\\"'))
self.headers.append(('Content-Disposition', self.headers.append(('Content-Disposition',
'inline; filename="%s"' % filename)) 'inline; filename="%s"' % filename))
if body is not None: if body is not None: