Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmposix.py @ 30290:c90a05124fae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: make scmposix.userrcpath() return bytes We are making sure that we deal with bytes as much we can. This is a part of fixing functions so that they return bytes if they have to. Used encoding.environ to return bytes. After this patch, scmposix.userrcpath() returns bytes and scmutil.osrcpath() will also return bytes if the platform is posix. Functions is scmposix returns bytes on Python 3 now.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 03 Nov 2016 02:17:01 +0530
parents 39087ee88835
children 4b1af1c867fa
line wrap: on
line diff
--- a/mercurial/scmposix.py	Tue Nov 01 08:22:50 2016 +0000
+++ b/mercurial/scmposix.py	Thu Nov 03 02:17:01 2016 +0530
@@ -4,6 +4,7 @@
 import sys
 
 from . import (
+    encoding,
     osutil,
 )
 
@@ -34,6 +35,6 @@
 
 def userrcpath():
     if sys.platform == 'plan9':
-        return [os.environ['home'] + '/lib/hgrc']
+        return [encoding.environ['home'] + '/lib/hgrc']
     else:
         return [os.path.expanduser('~/.hgrc')]