Patchwork [4,of,7] py3: make scmposix.userrcpath() return bytes

login
register
mail settings
Submitter Pulkit Goyal
Date Nov. 2, 2016, 10:15 p.m.
Message ID <b0e4b8169c8f8080cee7.1478124918@pulkit-goyal>
Download mbox | patch
Permalink /patch/17294/
State Not Applicable
Headers show

Comments

Pulkit Goyal - Nov. 2, 2016, 10:15 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1478119621 -19800
#      Thu Nov 03 02:17:01 2016 +0530
# Node ID b0e4b8169c8f8080cee7648ddd8824025814e905
# Parent  0b45aa3edc2c725eaa82dde9df39a17eb8585ff0
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.

Patch

diff -r 0b45aa3edc2c -r b0e4b8169c8f mercurial/scmposix.py
--- a/mercurial/scmposix.py	Thu Nov 03 02:09:38 2016 +0530
+++ b/mercurial/scmposix.py	Thu Nov 03 02:17:01 2016 +0530
@@ -4,6 +4,7 @@ 
 import sys
 
 from . import (
+    encoding,
     osutil,
 )
 
@@ -36,6 +37,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')]