From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 06:14:33 +0000 (-0000)
Subject: Don't try to call setdefaultencoding() since it's not intended to be called.
X-Git-Tag: v2.1.6.8~127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9bfbcf22862b56c5c3200892f6397b0a9780bd56;p=portage.git

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

svn path=/main/branches/2.1.6/; revision=12950
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4dfce23d1..077e25540 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7563,16 +7563,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