Mercurial > hg-stable
changeset 30621:6f9fcd29e290
py3: replace os.sep with pycompat.ossep (part 4 of 4)
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 17 Dec 2016 20:24:46 +0530 |
parents | bb77654dc7ae |
children | 32a07b8a9f77 |
files | hgext/convert/cvsps.py hgext/win32mbcs.py |
diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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