Mercurial > public > mercurial-scm > hg

diff mercurial/url.py @ 30636:f1c9fafcbf46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace os.environ with encoding.environ (part 3 of 5)
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 18 Dec 2016 01:54:36 +0530
parents 44ea12756fef
children 69459fdf3b1b
line wrap: on
line diff
--- a/mercurial/url.py	Sun Dec 18 01:46:39 2016 +0530
+++ b/mercurial/url.py	Sun Dec 18 01:54:36 2016 +0530
@@ -15,6 +15,7 @@
 
 from .i18n import _
 from . import (
+    encoding,
     error,
     httpconnection as httpconnectionmod,
     keepalive,
@@ -118,8 +119,8 @@
         if ui.config("http_proxy", "host"):
             for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
                 try:
-                    if env in os.environ:
-                        del os.environ[env]
+                    if env in encoding.environ:
+                        del encoding.environ[env]
                 except OSError:
                     pass