##// END OF EJS Templates
hgweb: fix a few `str` type conditional for py3...
Matt Harbison -
r44180:6ff1a0d1 stable
parent child Browse files
Show More
@@ -193,7 +193,7 b' def staticfile(directory, fname, res):'
193 return
193 return
194
194
195 fpath = os.path.join(*fname.split(b'/'))
195 fpath = os.path.join(*fname.split(b'/'))
196 if isinstance(directory, str):
196 if isinstance(directory, bytes):
197 directory = [directory]
197 directory = [directory]
198 for d in directory:
198 for d in directory:
199 path = os.path.join(d, fpath)
199 path = os.path.join(d, fpath)
@@ -412,7 +412,7 b' class hgwebdir(object):'
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
@@ -1321,7 +1321,7 b' def static(web):'
1321 static = web.config(b"web", b"static", untrusted=False)
1321 static = web.config(b"web", b"static", untrusted=False)
1322 if not static:
1322 if not static:
1323 tp = web.templatepath or templater.templatepaths()
1323 tp = web.templatepath or templater.templatepaths()
1324 if isinstance(tp, str):
1324 if isinstance(tp, bytes):
1325 tp = [tp]
1325 tp = [tp]
1326 static = [os.path.join(p, b'static') for p in tp]
1326 static = [os.path.join(p, b'static') for p in tp]
1327
1327
General Comments 0
You need to be logged in to leave comments. Login now