From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 21 May 2010 00:41:33 +0000 (-0700)
Subject: Use os.environ.get() instead of os.getenv(), to hopefully avoid issues
X-Git-Tag: v2.2_rc68~589
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3beb2d432d4fe288b3b1fafefcb702bd524ed4cd;p=portage.git

Use os.environ.get() instead of os.getenv(), to hopefully avoid issues
with python-3.2 reported by Arfrever.
---

diff --git a/pym/portage/output.py b/pym/portage/output.py
index 0dc218ed1..abe10f5f7 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -268,7 +268,7 @@ default_xterm_title = None
 def xtermTitleReset():
 	global default_xterm_title
 	if default_xterm_title is None:
-		prompt_command = os.getenv('PROMPT_COMMAND')
+		prompt_command = os.environ.get('PROMPT_COMMAND', '')
 		if prompt_command == "":
 			default_xterm_title = ""
 		elif prompt_command is not None:
@@ -288,12 +288,13 @@ def xtermTitleReset():
 					os.system(prompt_command)
 			return
 		else:
-			pwd = os.getenv('PWD','')
-			home = os.getenv('HOME', '')
+			pwd = os.environ.get('PWD','')
+			home = os.environ.get('HOME', '')
 			if home != '' and pwd.startswith(home):
 				pwd = '~' + pwd[len(home):]
 			default_xterm_title = '\x1b]0;%s@%s:%s\x07' % (
-				os.getenv('LOGNAME', ''), os.getenv('HOSTNAME', '').split('.', 1)[0], pwd)
+				os.environ.get('LOGNAME', ''),
+				os.environ.get('HOSTNAME', '').split('.', 1)[0], pwd)
 	xtermTitle(default_xterm_title, raw=True)
 
 def notitles():