summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2012-07-20 15:33:13 +0000
committerTed Ross <tross@apache.org>2012-07-20 15:33:13 +0000
commit43d9dfab9fbff43f805dddf007f0389459b7401b (patch)
tree8b3264cb50a0800c46ee40ed2015044cb3234bb6
parent3180e6f4cd35d155028b11e3824c5ce767995789 (diff)
downloadqpid-python-43d9dfab9fbff43f805dddf007f0389459b7401b.tar.gz
QPID-4155 - Merged from trunk at revision 1363795.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1363845 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/tools/src/py/qpidtoollibs/disp.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/tools/src/py/qpidtoollibs/disp.py b/qpid/tools/src/py/qpidtoollibs/disp.py
index a0c77370a5..53e7bee267 100644
--- a/qpid/tools/src/py/qpidtoollibs/disp.py
+++ b/qpid/tools/src/py/qpidtoollibs/disp.py
@@ -167,7 +167,7 @@ class Display:
for head in heads:
width = len (head)
for row in rows:
- cellWidth = len (unicode (row[col]))
+ cellWidth = len (unicode (row[col].decode('utf-8')))
if cellWidth > width:
width = cellWidth
colWidth.append (width + self.tableSpacing)
@@ -187,9 +187,9 @@ class Display:
line = self.tablePrefix
col = 0
for width in colWidth:
- line = line + unicode (row[col])
+ line = line + unicode (row[col].decode('utf-8'))
if col < len (heads) - 1:
- for i in range (width - len (unicode (row[col]))):
+ for i in range (width - len (unicode (row[col].decode('utf-8')))):
line = line + " "
col = col + 1
print line