From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Feb 2009 08:32:37 +0000 (-0000)
Subject: Don't try to call setdefaultencoding() since it's not intended to be called.
X-Git-Tag: v2.2_rc24~121
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36383ddf8a608a4df5818071f26884acd1170d8c;p=portage.git

Don't try to call setdefaultencoding() since it's not intended to be called.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index a5323b007..5891732a6 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7576,16 +7576,12 @@ def _ensure_default_encoding():
 
 		default_fallback = 'utf_8'
 
-		if hasattr(sys, 'setdefaultencoding'):
-			sys.setdefaultencoding(default_fallback)
-		else:
-			# The sys.setdefaultencoding() function doesn't exist,
-			# so just make the fallback codec correspond to whatever
-			# name happens to be returned by sys.getdefaultencoding().
-			try:
-				encodings[default_encoding] = codecs.lookup(default_fallback)
-			except LookupError:
-				encodings[default_encoding] = encodings[default_fallback]
+		# Make the fallback codec correspond to whatever name happens
+		# to be returned by sys.getdefaultencoding().
+		try:
+			encodings[default_encoding] = codecs.lookup(default_fallback)
+		except LookupError:
+			encodings[default_encoding] = encodings[default_fallback]
 
 		del default_fallback