This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7534

hgweb: fix a few `str` type conditional for py3
ClosedPublic

Authored by mharbison72 on Nov 30 2019, 12:09 PM.

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6ff1a0d109c9: hgweb: fix a few `str` type conditional for py3

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

mharbison72 created this revision.Nov 30 2019, 12:09 PM
dlax accepted this revision.Dec 1 2019, 4:51 AM
pulkit accepted this revision.Dec 2 2019, 10:06 AM
This revision is now accepted and ready to land.Dec 2 2019, 10:06 AM
mharbison72 added a commit: rHG6ff1a0d109c9: hgweb: fix a few `str` type conditional for py3.Dec 2 2019, 4:55 PM
Closed by commit rHG6ff1a0d109c9: hgweb: fix a few `str` type conditional for py3 (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18427

mercurial/hgweb/common.py

Content-Type is guessed using the mimetypes module. Content-Type is guessed using the mimetypes module.
Return an empty string if fname is illegal or file not found. Return an empty string if fname is illegal or file not found.
""" """
if not ispathsafe(fname): if not ispathsafe(fname):
return return
fpath = os.path.join(*fname.split(b'/')) fpath = os.path.join(*fname.split(b'/'))
if isinstance(directory, str): if isinstance(directory, bytes):
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 = pycompat.sysbytes( ct = pycompat.sysbytes(

mercurial/hgweb/hgwebdir_mod.py

if virtual.startswith(b'static/') or b'static' in req.qsparams: if virtual.startswith(b'static/') or b'static' in req.qsparams:
if virtual.startswith(b'static/'): if virtual.startswith(b'static/'):
fname = virtual[7:] fname = virtual[7:]
else: else:
fname = req.qsparams[b'static'] fname = req.qsparams[b'static']
static = self.ui.config(b"web", b"static", untrusted=False) static = self.ui.config(b"web", b"static", untrusted=False)
if not static: if not static:
tp = self.templatepath or templater.templatepaths() tp = self.templatepath or templater.templatepaths()
if isinstance(tp, str): if isinstance(tp, bytes):
tp = [tp] tp = [tp]
static = [os.path.join(p, b'static') for p in tp] static = [os.path.join(p, b'static') for p in tp]
staticfile(static, fname, res) staticfile(static, fname, res)
return res.sendresponse() return res.sendresponse()
# top-level index # top-level index

mercurial/hgweb/webcommands.py

@webcommand(b'static') @webcommand(b'static')
def static(web): def static(web):
fname = web.req.qsparams[b'file'] fname = web.req.qsparams[b'file']
# a repo owner may set web.static in .hg/hgrc to get any file # a repo owner may set web.static in .hg/hgrc to get any file
# readable by the user running the CGI script # readable by the user running the CGI script
static = web.config(b"web", b"static", untrusted=False) static = web.config(b"web", b"static", untrusted=False)
if not static: if not static:
tp = web.templatepath or templater.templatepaths() tp = web.templatepath or templater.templatepaths()
if isinstance(tp, str): if isinstance(tp, bytes):
tp = [tp] tp = [tp]
static = [os.path.join(p, b'static') for p in tp] static = [os.path.join(p, b'static') for p in tp]
staticfile(static, fname, web.res) staticfile(static, fname, web.res)
return web.res.sendresponse() return web.res.sendresponse()
@webcommand(b'graph') @webcommand(b'graph')