# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520098565 18000
# Node ID 6585ac350fd9b2949f18d1174811fb5491604fd6
# Parent  052351e3e1cda49248d05bc32597c8ac462507ba
py3: make os.curdir a bytes

diff -r 052351e3e1cd -r 6585ac350fd9 mercurial/hgweb/common.py
--- a/mercurial/hgweb/common.py	Sat Mar 03 12:34:35 2018 -0500
+++ b/mercurial/hgweb/common.py	Sat Mar 03 12:36:05 2018 -0500
@@ -138,7 +138,7 @@
     """Determine if a path is safe to use for filesystem access."""
     parts = path.split('/')
     for part in parts:
-        if (part in ('', os.curdir, pycompat.ospardir) or
+        if (part in ('', pycompat.oscurdir, pycompat.ospardir) or
             pycompat.ossep in part or
             pycompat.osaltsep is not None and pycompat.osaltsep in part):
             return False
diff -r 052351e3e1cd -r 6585ac350fd9 mercurial/pycompat.py
--- a/mercurial/pycompat.py	Sat Mar 03 12:34:35 2018 -0500
+++ b/mercurial/pycompat.py	Sat Mar 03 12:36:05 2018 -0500
@@ -48,6 +48,7 @@
 
     fsencode = os.fsencode
     fsdecode = os.fsdecode
+    oscurdir = os.curdir.encode('ascii')
     oslinesep = os.linesep.encode('ascii')
     osname = os.name.encode('ascii')
     ospathsep = os.pathsep.encode('ascii')
@@ -321,6 +322,7 @@
     strkwargs = identity
     byteskwargs = identity
 
+    oscurdir = os.curdir
     oslinesep = os.linesep
     osname = os.name
     ospathsep = os.pathsep
diff -r 052351e3e1cd -r 6585ac350fd9 mercurial/templater.py
--- a/mercurial/templater.py	Sat Mar 03 12:34:35 2018 -0500
+++ b/mercurial/templater.py	Sat Mar 03 12:36:05 2018 -0500
@@ -1600,7 +1600,7 @@
     for style in styles:
         # only plain name is allowed to honor template paths
         if (not style
-            or style in (os.curdir, pycompat.ospardir)
+            or style in (pycompat.oscurdir, pycompat.ospardir)
             or pycompat.ossep in style
             or pycompat.osaltsep and pycompat.osaltsep in style):
             continue