D7534: hgweb: fix a few `str` type conditional for py3
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Sat Nov 30 17:09:36 UTC 2019
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D7534
AFFECTED FILES
mercurial/hgweb/common.py
mercurial/hgweb/hgwebdir_mod.py
mercurial/hgweb/webcommands.py
CHANGE DETAILS
diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -1321,7 +1321,7 @@
static = web.config(b"web", b"static", untrusted=False)
if not static:
tp = web.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]
diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py
+++ b/mercurial/hgweb/hgwebdir_mod.py
@@ -412,7 +412,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]
diff --git a/mercurial/hgweb/common.py b/mercurial/hgweb/common.py
--- a/mercurial/hgweb/common.py
+++ b/mercurial/hgweb/common.py
@@ -193,7 +193,7 @@
return
fpath = os.path.join(*fname.split(b'/'))
- if isinstance(directory, str):
+ if isinstance(directory, bytes):
directory = [directory]
for d in directory:
path = os.path.join(d, fpath)
To: mharbison72, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list