Mercurial > hg
diff mercurial/pycompat.py @ 39818:24e493ec2229
py3: rename pycompat.getcwd() to encoding.getcwd() (API)
We need to avoid os.getcwdb() on Windows to avoid DeprecationWarnings, and we
need encoding.strtolocal() to encode the result of os.getcwd().
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 21 Sep 2018 19:48:23 -0400 |
parents | a407f9009392 |
children | 1b49b84d5ed5 |
line wrap: on
line diff
--- a/mercurial/pycompat.py Mon Sep 24 22:46:22 2018 -0400 +++ b/mercurial/pycompat.py Fri Sep 21 19:48:23 2018 -0400 @@ -97,9 +97,7 @@ osaltsep = os.altsep if osaltsep: osaltsep = osaltsep.encode('ascii') - # os.getcwd() on Python 3 returns string, but it has os.getcwdb() which - # returns bytes. - getcwd = os.getcwdb + sysplatform = sys.platform.encode('ascii') sysexecutable = sys.executable if sysexecutable: @@ -393,7 +391,6 @@ if getattr(sys, 'argv', None) is not None: sysargv = sys.argv sysplatform = sys.platform - getcwd = os.getcwd sysexecutable = sys.executable shlexsplit = shlex.split bytesio = cStringIO.StringIO