Use cuni rather than unicode

svn: r22988
This commit is contained in:
Doug Blank 2013-09-01 11:20:35 +00:00
parent 6f7cdb8fd2
commit 653cb3882b

View File

@ -165,7 +165,7 @@ class SimpleTable(object):
if (self._link_col == col or link is None): if (self._link_col == col or link is None):
link = ('Date', item) link = ('Date', item)
elif isinstance(item, Span): elif isinstance(item, Span):
text = unicode(item) text = conv_to_unicode_direct(item)
retval.append(text) retval.append(text)
self.row_sort_val(col, item) self.row_sort_val(col, item)
elif isinstance(item, list): # [text, "PersonList", handle, ...] elif isinstance(item, list): # [text, "PersonList", handle, ...]
@ -238,7 +238,7 @@ class SimpleTable(object):
else: else:
doc.start_link("/%s/%s" % doc.start_link("/%s/%s" %
(obj_type.lower(), handle)) (obj_type.lower(), handle))
doc.write_text(unicode(col), 'Normal') doc.write_text(conv_to_unicode_direct(col), 'Normal')
if obj_type and handle: if obj_type and handle:
doc.stop_link() doc.stop_link()
doc.end_cell() doc.end_cell()