This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4967

py3: pass str and return bytes from mimetypes.guess_type()
ClosedPublic

Authored by indygreg on Oct 12 2018, 4:09 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9310037f0636: py3: pass str and return bytes from mimetypes.guess_type()
Summary

This function wants a str (which represents a path) and returns a str.
We normalize input to str and output to bytes.

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.Oct 12 2018, 4:09 AM
Closed by commit rHG9310037f0636: py3: pass str and return bytes from mimetypes.guess_type() (authored by indygreg). · Explain WhyOct 12 2018, 6:47 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Oct 12 2018, 11:08 AM

+ mt = pycompat.sysbytes(
+ mimetypes.guess_type(pycompat.fsdecode(f))[0]
+ or 'application/octet-stream')

The default value has to be either r'' prefixed or moved out of the
sysbytes().

Revision Contents
Changeset List

Diff 11858

mercurial/hgweb/common.py

if isinstance(directory, str): if isinstance(directory, str):
directory = [directory] directory = [directory]
for d in directory: for d in directory:
path = os.path.join(d, fpath) path = os.path.join(d, fpath)
if os.path.exists(path): if os.path.exists(path):
break break
try: try:
os.stat(path) os.stat(path)
ct = mimetypes.guess_type(pycompat.fsdecode(path))[0] or "text/plain" ct = pycompat.sysbytes(
mimetypes.guess_type(pycompat.fsdecode(path))[0] or "text/plain")
with open(path, 'rb') as fh: with open(path, 'rb') as fh:
data = fh.read() data = fh.read()
res.headers['Content-Type'] = ct res.headers['Content-Type'] = ct
res.setbodybytes(data) res.setbodybytes(data)
return res return res
except TypeError: except TypeError:
raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename') raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename')

mercurial/hgweb/webcommands.py

return manifest(web) return manifest(web)
except ErrorResponse: except ErrorResponse:
raise inst raise inst
path = fctx.path() path = fctx.path()
text = fctx.data() text = fctx.data()
mt = 'application/binary' mt = 'application/binary'
if guessmime: if guessmime:
mt = mimetypes.guess_type(path)[0] mt = mimetypes.guess_type(pycompat.fsdecode(path))[0]
if mt is None: if mt is None:
if stringutil.binary(text): if stringutil.binary(text):
mt = 'application/binary' mt = 'application/binary'
else: else:
mt = 'text/plain' mt = 'text/plain'
else:
mt = pycompat.sysbytes(mt)
if mt.startswith('text/'): if mt.startswith('text/'):
mt += '; charset="%s"' % encoding.encoding mt += '; charset="%s"' % encoding.encoding
web.res.headers['Content-Type'] = mt web.res.headers['Content-Type'] = mt
filename = (path.rpartition('/')[-1] filename = (path.rpartition('/')[-1]
.replace('\\', '\\\\').replace('"', '\\"')) .replace('\\', '\\\\').replace('"', '\\"'))
web.res.headers['Content-Disposition'] = 'inline; filename="%s"' % filename web.res.headers['Content-Disposition'] = 'inline; filename="%s"' % filename
web.res.setbodybytes(text) web.res.setbodybytes(text)
return web.res.sendresponse() return web.res.sendresponse()
def _filerevision(web, fctx): def _filerevision(web, fctx):
f = fctx.path() f = fctx.path()
text = fctx.data() text = fctx.data()
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
ishead = fctx.filenode() in fctx.filelog().heads() ishead = fctx.filenode() in fctx.filelog().heads()
if stringutil.binary(text): if stringutil.binary(text):
mt = mimetypes.guess_type(f)[0] or 'application/octet-stream' mt = pycompat.sysbytes(
mimetypes.guess_type(pycompat.fsdecode(f))[0]
or 'application/octet-stream')
text = '(binary:%s)' % mt text = '(binary:%s)' % mt
def lines(context): def lines(context):
for lineno, t in enumerate(text.splitlines(True)): for lineno, t in enumerate(text.splitlines(True)):
yield {"line": t, yield {"line": t,
"lineid": "l%d" % (lineno + 1), "lineid": "l%d" % (lineno + 1),
"linenumber": "% 6d" % (lineno + 1), "linenumber": "% 6d" % (lineno + 1),
"parity": next(parity)} "parity": next(parity)}
parsecontext = lambda v: v == 'full' and -1 or int(v) parsecontext = lambda v: v == 'full' and -1 or int(v)
if 'context' in web.req.qsparams: if 'context' in web.req.qsparams:
context = parsecontext(web.req.qsparams['context']) context = parsecontext(web.req.qsparams['context'])
else: else:
context = parsecontext(web.config('web', 'comparisoncontext', '5')) context = parsecontext(web.config('web', 'comparisoncontext', '5'))
def filelines(f): def filelines(f):
if f.isbinary(): if f.isbinary():
mt = mimetypes.guess_type(f.path())[0] mt = pycompat.sysbytes(
if not mt: mimetypes.guess_type(pycompat.fsdecode(f.path()))[0]
mt = 'application/octet-stream' or 'application/octet-stream')
return [_('(binary file %s, hash: %s)') % (mt, hex(f.filenode()))] return [_('(binary file %s, hash: %s)') % (mt, hex(f.filenode()))]
return f.data().splitlines() return f.data().splitlines()
fctx = None fctx = None
parent = ctx.p1() parent = ctx.p1()
leftrev = parent.rev() leftrev = parent.rev()
leftnode = parent.node() leftnode = parent.node()
rightrev = ctx.rev() rightrev = ctx.rev()
} }
parentscache[rev].append(entry) parentscache[rev].append(entry)
for p in parentscache[rev]: for p in parentscache[rev]:
yield p yield p
def annotate(context): def annotate(context):
if fctx.isbinary(): if fctx.isbinary():
mt = (mimetypes.guess_type(fctx.path())[0] mt = pycompat.sysbytes(
mimetypes.guess_type(pycompat.fsdecode(fctx.path()))[0]
or 'application/octet-stream') or 'application/octet-stream')
lines = [dagop.annotateline(fctx=fctx.filectx(fctx.filerev()), lines = [dagop.annotateline(fctx=fctx.filectx(fctx.filerev()),
lineno=1, text='(binary:%s)' % mt)] lineno=1, text='(binary:%s)' % mt)]
else: else:
lines = webutil.annotate(web.req, fctx, web.repo.ui) lines = webutil.annotate(web.req, fctx, web.repo.ui)
previousrev = None previousrev = None
blockparitygen = paritygen(1) blockparitygen = paritygen(1)
for lineno, aline in enumerate(lines): for lineno, aline in enumerate(lines):