From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 11 Jul 2010 19:17:15 +0000 (-0700)
Subject: In _unicode_func_wrapper.__call__, don't want to convert return values
X-Git-Tag: v2.2_rc68~523
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d9bdc4620d44cfbd6bdd0c8e4814b68fb7a0a66;p=portage.git

In _unicode_func_wrapper.__call__, don't want to convert return values
which are subclasses of tuple (such as posix.stat_result in python-3.2).
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 68b99de6c..acf151aea 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -226,7 +226,9 @@ class _unicode_func_wrapper(object):
 
 		rval = self._func(*wrapped_args, **wrapped_kwargs)
 
-		if isinstance(rval, (list, tuple)):
+		# Don't use isinstance() since we don't want to convert subclasses
+		# of tuple such as posix.stat_result in python-3.2.
+		if rval.__class__ in (list, tuple):
 			decoded_rval = []
 			for x in rval:
 				try: