# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2016-11-21 09:56:47 # Node ID 5b0baa9f3362fd887c83ac937caa88fe3486f407 # Parent 2add671bf55bc2a5506405aa04c64b41c6d22420 py3: use pycompat.sysargv in scmposix.systemrcpath() sys.argv returns unicodes on Python 3. We have pycompat.sysargv which returns bytes encoded using os.fsencode(). After this patch scmposix.systemrcpath() returns bytes in Python 3 world. This change is also a part of making `hg version` run in Python 3. diff --git a/mercurial/scmposix.py b/mercurial/scmposix.py --- a/mercurial/scmposix.py +++ b/mercurial/scmposix.py @@ -9,6 +9,7 @@ import sys from . import ( encoding, osutil, + pycompat, ) def _rcfiles(path): @@ -30,7 +31,7 @@ def systemrcpath(): root = 'etc/mercurial' # old mod_python does not set sys.argv if len(getattr(sys, 'argv', [])) > 0: - p = os.path.dirname(os.path.dirname(sys.argv[0])) + p = os.path.dirname(os.path.dirname(pycompat.sysargv[0])) if p != '/': path.extend(_rcfiles(os.path.join(p, root))) path.extend(_rcfiles('/' + root))