From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 29 Jan 2010 18:45:49 +0000 (-0000)
Subject: In python-2.x, convert PortageException.value attribute from unicode to str
X-Git-Tag: v2.1.7.17~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97ebf8f22457f51eb37ca3131adfbdfd75f24b1e;p=portage.git

In python-2.x, convert PortageException.value attribute from unicode to str
in order to avoid empty output with string format operator. (trunk r15169)

svn path=/main/branches/2.1.7/; revision=15237
---

diff --git a/pym/portage/exception.py b/pym/portage/exception.py
index 85efc2767..900dab7df 100644
--- a/pym/portage/exception.py
+++ b/pym/portage/exception.py
@@ -3,6 +3,7 @@
 # $Id$
 
 import sys
+from portage import _unicode_encode
 from portage.localization import _
 
 if sys.hexversion >= 0x3000000:
@@ -12,6 +13,10 @@ class PortageException(Exception):
 	"""General superclass for portage exceptions"""
 	def __init__(self,value):
 		self.value = value[:]
+		if sys.hexversion < 0x3000000 and isinstance(self.value, unicode):
+			# Workaround for string formatting operator and unicode value
+			# attribute triggering empty output in formatted string.
+			self.value = _unicode_encode(self.value)
 	def __str__(self):
 		if isinstance(self.value, basestring):
 			return self.value