diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:45:49 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:45:49 +0000 |
commit | 97ebf8f22457f51eb37ca3131adfbdfd75f24b1e (patch) | |
tree | 5245eb5677e36c74bce19de7d84ffbb361b54492 | |
parent | e80fa7f53aa6211db7d4334f53b0af8b3cfad711 (diff) | |
download | portage-97ebf8f22457f51eb37ca3131adfbdfd75f24b1e.tar.gz portage-97ebf8f22457f51eb37ca3131adfbdfd75f24b1e.tar.bz2 portage-97ebf8f22457f51eb37ca3131adfbdfd75f24b1e.zip |
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
-rw-r--r-- | pym/portage/exception.py | 5 |
1 files changed, 5 insertions, 0 deletions
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 |