diff mercurial/pathutil.py @ 30619:cfe66dcf45c0

py3: replace os.sep with pycompat.ossep (part 2 of 4) This part also replaces some chunks of os.sep with pycompat.ossep.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 17 Dec 2016 20:02:50 +0530
parents 318a24b52eeb
children 456626e9c3d1 20bac46f7744
line wrap: on
line diff
--- a/mercurial/pathutil.py	Sat Dec 17 19:56:30 2016 +0530
+++ b/mercurial/pathutil.py	Sat Dec 17 20:02:50 2016 +0530
@@ -9,6 +9,7 @@
 from . import (
     encoding,
     error,
+    pycompat,
     util,
 )
 
@@ -87,8 +88,8 @@
         # This means we won't accidentally traverse a symlink into some other
         # filesystem (which is potentially expensive to access).
         for i in range(len(parts)):
-            prefix = os.sep.join(parts[:i + 1])
-            normprefix = os.sep.join(normparts[:i + 1])
+            prefix = pycompat.ossep.join(parts[:i + 1])
+            normprefix = pycompat.ossep.join(normparts[:i + 1])
             if normprefix in self.auditeddir:
                 continue
             if self._realfs:
@@ -132,7 +133,7 @@
     if util.endswithsep(root):
         rootsep = root
     else:
-        rootsep = root + os.sep
+        rootsep = root + pycompat.ossep
     name = myname
     if not os.path.isabs(name):
         name = os.path.join(root, cwd, name)
@@ -202,8 +203,8 @@
     '/'
     '''
     d, p = os.path.splitdrive(path)
-    if len(p) != len(os.sep):
-        return path + os.sep
+    if len(p) != len(pycompat.ossep):
+        return path + pycompat.ossep
     else:
         return path