diff mercurial/hgweb/common.py @ 43811:29adf0a087a1

merge with stable
author Augie Fackler <augie@google.com>
date Thu, 05 Dec 2019 11:15:19 -0500
parents 9f70512ae2cf 6ff1a0d109c9
children 9a5c4875a88c
line wrap: on
line diff
--- a/mercurial/hgweb/common.py	Tue Dec 03 17:17:57 2019 -0800
+++ b/mercurial/hgweb/common.py	Thu Dec 05 11:15:19 2019 -0500
@@ -191,7 +191,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)