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

login
register
mail settings
Submitter Pulkit Goyal
Date Nov. 2, 2016, 10:23 p.m.
Message ID <e0e794c3b580b1f64d37.1478125389@pulkit-goyal>
Download mbox | patch
Permalink /patch/17301/
State Accepted
Headers show

Comments

Pulkit Goyal - Nov. 2, 2016, 10:23 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1478119621 -19800
#      Thu Nov 03 02:17:01 2016 +0530
# Node ID e0e794c3b580b1f64d37ccdd6d8bd606eb87880e
# Parent  9d54c24d17daddf2ede7fe7ce58751ab9a1780a4
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.
Yuya Nishihara - Nov. 4, 2016, 3:42 a.m.
On Thu, 03 Nov 2016 03:53:09 +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1478119621 -19800
> #      Thu Nov 03 02:17:01 2016 +0530
> # Node ID e0e794c3b580b1f64d37ccdd6d8bd606eb87880e
> # Parent  9d54c24d17daddf2ede7fe7ce58751ab9a1780a4
> py3: make scmposix.userrcpath() return bytes

LGTM, queued this, thanks.

Patch

diff -r 9d54c24d17da -r e0e794c3b580 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')]