Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/mercurial/hgweb/hgwebdir_mod.py Tue Dec 03 17:17:57 2019 -0800 +++ b/mercurial/hgweb/hgwebdir_mod.py Thu Dec 05 11:15:19 2019 -0500 @@ -413,7 +413,7 @@ static = self.ui.config(b"web", b"static", untrusted=False) if not static: tp = self.templatepath or templater.templatepaths() - if isinstance(tp, str): + if isinstance(tp, bytes): tp = [tp] static = [os.path.join(p, b'static') for p in tp]