Mercurial > public > mercurial-scm > hg-stable

diff mercurial/pycompat.py @ 36676:052351e3e1cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: make os.pardir a bytes
author Yuya Nishihara <yuya@tcha.org>
date Sat, 03 Mar 2018 12:34:35 -0500
parents e2b87e19c6ef
children 6585ac350fd9
line wrap: on
line diff
--- a/mercurial/pycompat.py	Sat Mar 03 14:21:47 2018 -0500
+++ b/mercurial/pycompat.py	Sat Mar 03 12:34:35 2018 -0500
@@ -51,6 +51,7 @@
     oslinesep = os.linesep.encode('ascii')
     osname = os.name.encode('ascii')
     ospathsep = os.pathsep.encode('ascii')
+    ospardir = os.pardir.encode('ascii')
     ossep = os.sep.encode('ascii')
     osaltsep = os.altsep
     if osaltsep:
@@ -323,6 +324,7 @@
     oslinesep = os.linesep
     osname = os.name
     ospathsep = os.pathsep
+    ospardir = os.pardir
     ossep = os.sep
     osaltsep = os.altsep
     stdin = sys.stdin