Skip to content

Commit 038a548

Browse files
committed
six don't fail me now.
1 parent 5fb0cdd commit 038a548

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

textile/utils.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ def generate_tag(tag, content, attributes=None):
5757
# adding text by assigning it to element_tag.text. That results in
5858
# non-ascii text being html-entity encoded. Not bad, but not entirely
5959
# matching php-textile either.
60-
element_tag = [v.decode(enc) for v in ElementTree.tostringlist(element, encoding=enc,
61-
method='html')]
60+
element_tag = ElementTree.tostringlist(element, encoding=enc,
61+
method='html')
62+
if six.PY2:
63+
element_tag = [v.decode('utf8') for v in element_tag]
6264
element_tag.insert(len(element_tag) - 1, content)
6365
element_text = ''.join(element_tag)
6466
return element_text

0 commit comments

Comments
 (0)