summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/UseFlagDisplay.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-16 03:18:44 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-16 03:18:44 -0700
commit724e9e28185d35398bbbd445eccfa7592c4f641b (patch)
tree3aba6242df1b4ad8dfa7ddf05f031042ec543ba2 /pym/_emerge/UseFlagDisplay.py
parent50b39d4bbd4b0ca8d65f22793a044119a391f36f (diff)
downloadportage-724e9e28185d35398bbbd445eccfa7592c4f641b.tar.gz
portage-724e9e28185d35398bbbd445eccfa7592c4f641b.tar.bz2
portage-724e9e28185d35398bbbd445eccfa7592c4f641b.zip
Make UseFlagDisplay __str__ and __unicode__ methods more like
DependencyArg, and add tests.
Diffstat (limited to 'pym/_emerge/UseFlagDisplay.py')
-rw-r--r--pym/_emerge/UseFlagDisplay.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/pym/_emerge/UseFlagDisplay.py b/pym/_emerge/UseFlagDisplay.py
index db2d6ca16..3721ef09e 100644
--- a/pym/_emerge/UseFlagDisplay.py
+++ b/pym/_emerge/UseFlagDisplay.py
@@ -1,9 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+import sys
+
+from portage import _encodings, _unicode_encode
from portage.output import red
from portage.util import cmp_sort_key
from portage.output import blue
+
class UseFlagDisplay(object):
__slots__ = ('name', 'enabled', 'forced')
@@ -24,6 +28,14 @@ class UseFlagDisplay(object):
s = '(%s)' % s
return s
+ if sys.hexversion < 0x3000000:
+
+ __unicode__ = __str__
+
+ def __str__(self):
+ return _unicode_encode(self.__unicode__(),
+ encoding=_encodings['content'])
+
def _cmp_combined(a, b):
"""
Sort by name, combining enabled and disabled flags.