Make Package __str__ and __unicode__ methods more like DependencyArg.

1 files changed, 9 insertions, 1 deletions

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 0db16fb2f..66ac7ff67 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -4,7 +4,7 @@
 import sys
 from itertools import chain
 import portage
-from portage import _unicode_decode
+from portage import _encodings, _unicode_decode, _unicode_encode
 from portage.cache.mappings import slot_dict_class
 from portage.const import EBUILD_PHASES
 from portage.dep import Atom, check_required_use, use_reduce, \
@@ -298,6 +298,14 @@ class Package(Task):
 		s += ")"
 		return s
 
+	if sys.hexversion < 0x3000000:
+
+		__unicode__ = __str__
+
+		def __str__(self):
+			return _unicode_encode(self.__unicode__(),
+				encoding=_encodings['content'])
+
 	class _use_class(object):
 
 		__slots__ = ("__weakref__", "enabled")