From patchwork Sat Dec 17 15:41:45 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [6,of,6] py3: replace os.sep with pycompat.ossep (part 4 of 4)
From: Pulkit Goyal <7895pulkit@gmail.com>
X-Patchwork-Id: 17948
Message-Id: <2fadbc71f79ad9e91892.1481989305@pulkit-goyal>
To: mercurial-devel@mercurial-scm.org
Date: Sat, 17 Dec 2016 21:11:45 +0530

# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1481986486 -19800
#      Sat Dec 17 20:24:46 2016 +0530
# Node ID 2fadbc71f79ad9e91892faf650a3fed05dbfd6b8
# Parent  c816d1b5b807f8076b027f9cb9ffdeafe5fd7e62
py3: replace os.sep with pycompat.ossep (part 4 of 4)

diff -r c816d1b5b807 -r 2fadbc71f79a hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py	Sat Dec 17 20:14:24 2016 +0530
+++ b/hgext/convert/cvsps.py	Sat Dec 17 20:24:46 2016 +0530
@@ -12,6 +12,7 @@
 from mercurial.i18n import _
 from mercurial import (
     hook,
+    pycompat,
     util,
 )
 
@@ -136,8 +137,8 @@
         except IOError:
             raise logerror(_('not a CVS sandbox'))
 
-        if prefix and not prefix.endswith(os.sep):
-            prefix += os.sep
+        if prefix and not prefix.endswith(pycompat.ossep):
+            prefix += pycompat.ossep
 
         # Use the Root file in the sandbox, if it exists
         try:
diff -r c816d1b5b807 -r 2fadbc71f79a hgext/win32mbcs.py
--- a/hgext/win32mbcs.py	Sat Dec 17 20:14:24 2016 +0530
+++ b/hgext/win32mbcs.py	Sat Dec 17 20:24:46 2016 +0530
@@ -53,6 +53,7 @@
 from mercurial import (
     encoding,
     error,
+    pycompat,
 )
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
@@ -97,7 +98,7 @@
     except UnicodeError:
         us = s
     if us and us[-1] not in ':/\\':
-        s += os.sep
+        s += pycompat.ossep
     return s