Mercurial > hg
changeset 30625:bcf4a975f93d
py3: replace os.altsep with pycompat.altsep
All the occurences of os.altsep are replaced with pycompat.altsep which
returns bytes.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 18 Dec 2016 01:17:12 +0530 |
| parents | a82a6eee2613 |
| children | 438532c99b54 |
| files | mercurial/hgweb/common.py mercurial/templater.py mercurial/util.py |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/common.py Sun Dec 18 00:52:05 2016 +0530 +++ b/mercurial/hgweb/common.py Sun Dec 18 01:17:12 2016 +0530 @@ -143,7 +143,7 @@ for part in parts: if (part in ('', os.curdir, os.pardir) or pycompat.ossep in part or - os.altsep is not None and os.altsep in part): + pycompat.osaltsep is not None and pycompat.osaltsep in part): return fpath = os.path.join(*parts) if isinstance(directory, str):
--- a/mercurial/templater.py Sun Dec 18 00:52:05 2016 +0530 +++ b/mercurial/templater.py Sun Dec 18 01:17:12 2016 +0530 @@ -1245,7 +1245,7 @@ if (not style or style in (os.curdir, os.pardir) or pycompat.ossep in style - or os.altsep and os.altsep in style): + or pycompat.osaltsep and pycompat.osaltsep in style): continue locations = [os.path.join(style, 'map'), 'map-' + style] locations.append('map')
--- a/mercurial/util.py Sun Dec 18 00:52:05 2016 +0530 +++ b/mercurial/util.py Sun Dec 18 01:17:12 2016 +0530 @@ -1304,8 +1304,8 @@ return dict((normcase(n), n) for n in os.listdir(dir)) seps = pycompat.ossep - if os.altsep: - seps = seps + os.altsep + if pycompat.osaltsep: + seps = seps + pycompat.osaltsep # Protect backslashes. This gets silly very quickly. seps.replace('\\','\\\\') pattern = remod.compile(r'([^%s]+)|([%s]+)' % (seps, seps)) @@ -1371,7 +1371,7 @@ def endswithsep(path): '''Check path ends with os.sep or os.altsep.''' return (path.endswith(pycompat.ossep) - or os.altsep and path.endswith(os.altsep)) + or pycompat.osaltsep and path.endswith(pycompat.osaltsep)) def splitpath(path): '''Split path by os.sep.