Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/hgwebdir_mod.py @ 43793:29adf0a087a1
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 05 Dec 2019 11:15:19 -0500 |
parents | 0b7733719d21 6ff1a0d109c9 |
children | 71582c5ad00f |
comparison
equal
deleted
inserted
replaced
43790:765a9c299c44 | 43793:29adf0a087a1 |
---|---|
411 else: | 411 else: |
412 fname = req.qsparams[b'static'] | 412 fname = req.qsparams[b'static'] |
413 static = self.ui.config(b"web", b"static", untrusted=False) | 413 static = self.ui.config(b"web", b"static", untrusted=False) |
414 if not static: | 414 if not static: |
415 tp = self.templatepath or templater.templatepaths() | 415 tp = self.templatepath or templater.templatepaths() |
416 if isinstance(tp, str): | 416 if isinstance(tp, bytes): |
417 tp = [tp] | 417 tp = [tp] |
418 static = [os.path.join(p, b'static') for p in tp] | 418 static = [os.path.join(p, b'static') for p in tp] |
419 | 419 |
420 staticfile(static, fname, res) | 420 staticfile(static, fname, res) |
421 return res.sendresponse() | 421 return res.sendresponse() |