Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 30613:1112ff99d965
py3: replace os.sep with pycompat.ossep (part 1 of 4)
os.sep returns unicodes on Python 3. We have pycompat.ossep which returns
bytes. This patch is a part of 4 patch series which will replace all the
occurrences of os.sep to pycompat.ossep
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sat, 17 Dec 2016 19:56:30 +0530 |
| parents | cbc61b1b52ea |
| children | 201b44c8875c |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Dec 17 19:47:17 2016 +0530 +++ b/mercurial/commands.py Sat Dec 17 19:56:30 2016 +0530 @@ -2356,7 +2356,7 @@ def complete(path, acceptable): dirstate = repo.dirstate spec = os.path.normpath(os.path.join(pycompat.getcwd(), path)) - rootdir = repo.root + os.sep + rootdir = repo.root + pycompat.ossep if spec != repo.root and not spec.startswith(rootdir): return [], [] if os.path.isdir(spec): @@ -2364,7 +2364,7 @@ spec = spec[len(rootdir):] fixpaths = pycompat.ossep != '/' if fixpaths: - spec = spec.replace(os.sep, '/') + spec = spec.replace(pycompat.ossep, '/') speclen = len(spec) fullpaths = opts['full'] files, dirs = set(), set() @@ -2372,11 +2372,11 @@ for f, st in dirstate.iteritems(): if f.startswith(spec) and st[0] in acceptable: if fixpaths: - f = f.replace('/', os.sep) + f = f.replace('/', pycompat.ossep) if fullpaths: addfile(f) continue - s = f.find(os.sep, speclen) + s = f.find(pycompat.ossep, speclen) if s >= 0: adddir(f[:s]) else: