From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Mar 2009 08:15:57 +0000 (-0000)
Subject: Don't default env=os.environ directly in the config constructor because
X-Git-Tag: v2.2_rc24
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5bb74f40aa938cd2c5c71bde231c49918107ac1c;p=portage.git

Don't default env=os.environ directly in the config constructor because
that makes it show environment variables in api docs generated by epydoc.

svn path=/main/trunk/; revision=12824
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 24997e280..1dc81cf59 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1117,7 +1117,7 @@ class config(object):
 
 	def __init__(self, clone=None, mycpv=None, config_profile_path=None,
 		config_incrementals=None, config_root=None, target_root=None,
-		local_config=True, env=os.environ):
+		local_config=True, env=None):
 		"""
 		@param clone: If provided, init will use deepcopy to copy by value the instance.
 		@type clone: Instance of config class.
@@ -1455,6 +1455,8 @@ class config(object):
 				expand_map.update(env_d)
 
 			# backupenv is used for calculating incremental variables.
+			if env is None:
+				env = os.environ
 			self.backupenv = env.copy()
 
 			if env_d: