Patchwork py3: use encoding.environ instead of os.environ

login
register
mail settings
Submitter Pulkit Goyal
Date Oct. 9, 2016, 11:20 a.m.
Message ID <3ce847adae982625abac.1476012009@pulkit-goyal>
Download mbox | patch
Permalink /patch/16981/
State Accepted
Headers show

Comments

Pulkit Goyal - Oct. 9, 2016, 11:20 a.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1476009430 -7200
#      Sun Oct 09 12:37:10 2016 +0200
# Node ID 3ce847adae982625abac548017e43da189eb5e71
# Parent  74cd33c9be76c11ba42ba5f2448dcf90419866ba
py3: use encoding.environ instead of os.environ

This complains while running hg version on Python 3.5
Martijn Pieters - Oct. 9, 2016, 11:29 a.m.
On 9 October 2016 at 13:20, Pulkit Goyal <7895pulkit@gmail.com> wrote:

> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1476009430 -7200
> #      Sun Oct 09 12:37:10 2016 +0200
> # Node ID 3ce847adae982625abac548017e43da189eb5e71
> # Parent  74cd33c9be76c11ba42ba5f2448dcf90419866ba
> py3: use encoding.environ instead of os.environ
>
> This complains while running hg version on Python 3.5


+1.

And the excitement is mounting as we are now fixing issues by running `make
local PYTHON=python3`.


> diff -r 74cd33c9be76 -r 3ce847adae98 mercurial/scmutil.py
> --- a/mercurial/scmutil.py      Sat Oct 08 22:44:02 2016 +0200
> +++ b/mercurial/scmutil.py      Sun Oct 09 12:37:10 2016 +0200
> @@ -753,7 +753,7 @@
>      if no HGRCPATH, use default os-specific path.'''
>      global _rcpath
>      if _rcpath is None:
> -        if 'HGRCPATH' in os.environ:
> +        if 'HGRCPATH' in encoding.environ:
>              _rcpath = []
>              for p in os.environ['HGRCPATH'].split(os.pathsep):
>                  if not p:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Yuya Nishihara - Oct. 9, 2016, 12:45 p.m.
On Sun, 09 Oct 2016 13:20:09 +0200, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1476009430 -7200
> #      Sun Oct 09 12:37:10 2016 +0200
> # Node ID 3ce847adae982625abac548017e43da189eb5e71
> # Parent  74cd33c9be76c11ba42ba5f2448dcf90419866ba
> py3: use encoding.environ instead of os.environ

Queued, thanks!

Patch

diff -r 74cd33c9be76 -r 3ce847adae98 mercurial/scmutil.py
--- a/mercurial/scmutil.py	Sat Oct 08 22:44:02 2016 +0200
+++ b/mercurial/scmutil.py	Sun Oct 09 12:37:10 2016 +0200
@@ -753,7 +753,7 @@ 
     if no HGRCPATH, use default os-specific path.'''
     global _rcpath
     if _rcpath is None:
-        if 'HGRCPATH' in os.environ:
+        if 'HGRCPATH' in encoding.environ:
             _rcpath = []
             for p in os.environ['HGRCPATH'].split(os.pathsep):
                 if not p: