Mercurial > hg > pyhgsh

changeset 866:6d6095823b82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Fri, 12 Aug 2005 23:54:09 -0800
parents 6390c377a9e6 (diff) 2d2fee33ec68 (current diff)
children 0cd2ee61b10a 62ec665759f2
files doc/hg.1.txt mercurial/hg.py tests/test-merge-revert.out tests/test-merge-revert2 tests/test-merge-revert2.out
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Wed Aug 10 08:41:23 2005 +0100
+++ b/mercurial/hg.py	Fri Aug 12 23:54:09 2005 -0800
@@ -1801,8 +1801,11 @@
         # Note: urllib2 takes proxy values from the environment and those will
         # take precedence
         for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
-            if os.environ.has_key(env):
-                del os.environ[env]
+            try:
+                if os.environ.has_key(env):
+                    del os.environ[env]
+            except OSError:
+                pass
 
         proxy_handler = urllib2.BaseHandler()
         if host and not no_proxy: