summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-09-21 17:00:59 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-09-21 17:00:59 +0000
commit6f5dda26fffd5457f82ccb9bd12b2d1d0a42c970 (patch)
tree27a6938bf3fad940bf52598b7be78185b839e182
parente6809abc78708f7be28f5b18eb3cee4d36929bd2 (diff)
downloadportage-6f5dda26fffd5457f82ccb9bd12b2d1d0a42c970.tar.gz
portage-6f5dda26fffd5457f82ccb9bd12b2d1d0a42c970.tar.bz2
portage-6f5dda26fffd5457f82ccb9bd12b2d1d0a42c970.zip
Fix portage._unicode_func_wrapper.__call__() to properly handle bytes with Python 3.
svn path=/main/trunk/; revision=14331
-rw-r--r--pym/portage/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index a5a16734e..043486542 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -189,8 +189,8 @@ class _unicode_func_wrapper(object):
rval = self._func(*wrapped_args, **wrapped_kwargs)
- if isinstance(rval, (basestring, list, tuple)):
- if isinstance(rval, basestring):
+ if isinstance(rval, (bytes, basestring, list, tuple)):
+ if isinstance(rval, (bytes, basestring)):
rval = _unicode_decode(rval,
encoding=encoding, errors='replace')
else: