Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hgweb/hgwebdir_mod.py @ 43447:6ff1a0d109c9 stable
hgweb: fix a few `str` type conditional for py3
Differential Revision: https://phab.mercurial-scm.org/D7534
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 30 Nov 2019 02:53:39 -0500 |
parents | d783f945a701 |
children | 29adf0a087a1 |
comparison
equal
deleted
inserted
replaced
43446:8accf5fa9930 | 43447:6ff1a0d109c9 |
---|---|
410 else: | 410 else: |
411 fname = req.qsparams[b'static'] | 411 fname = req.qsparams[b'static'] |
412 static = self.ui.config(b"web", b"static", untrusted=False) | 412 static = self.ui.config(b"web", b"static", untrusted=False) |
413 if not static: | 413 if not static: |
414 tp = self.templatepath or templater.templatepaths() | 414 tp = self.templatepath or templater.templatepaths() |
415 if isinstance(tp, str): | 415 if isinstance(tp, bytes): |
416 tp = [tp] | 416 tp = [tp] |
417 static = [os.path.join(p, b'static') for p in tp] | 417 static = [os.path.join(p, b'static') for p in tp] |
418 | 418 |
419 staticfile(static, fname, res) | 419 staticfile(static, fname, res) |
420 return res.sendresponse() | 420 return res.sendresponse() |