diff options
author | Florent Le Coz <louiz@louiz.org> | 2011-11-08 02:15:57 +0100 |
---|---|---|
committer | Florent Le Coz <louiz@louiz.org> | 2011-11-08 02:15:57 +0100 |
commit | b3072bd26138913d0d65bd23bd538a87a1b182f7 (patch) | |
tree | d22f0e1704657f9e57fc8b960b7fda876419eae6 /src/xhtml.py | |
parent | b8b54735c7fe3bcdc2d3f739250b28e5facd9aef (diff) | |
parent | d83eda6fd4fc74d5bedb1ca860c1015e7e0d3732 (diff) | |
download | poezio-b3072bd26138913d0d65bd23bd538a87a1b182f7.tar.gz poezio-b3072bd26138913d0d65bd23bd538a87a1b182f7.tar.bz2 poezio-b3072bd26138913d0d65bd23bd538a87a1b182f7.tar.xz poezio-b3072bd26138913d0d65bd23bd538a87a1b182f7.zip |
Merge branch 'master' into plugins
Conflicts:
src/tabs.py
src/xhtml.py
Diffstat (limited to 'src/xhtml.py')
-rw-r--r-- | src/xhtml.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/xhtml.py b/src/xhtml.py index 973a4d18..99e0bf01 100644 --- a/src/xhtml.py +++ b/src/xhtml.py @@ -16,7 +16,11 @@ import re import subprocess import curses from sleekxmpp.xmlstream import ET + +import xml.sax.saxutils + from xml.etree.ElementTree import ElementTree + from sys import version_info from config import config @@ -399,7 +403,7 @@ def poezio_colors_to_html(string): while next_attr_char != -1: attr_char = string[next_attr_char+1].lower() if next_attr_char != 0: - res += string[:next_attr_char] + res += xml.sax.saxutils.escape(string[:next_attr_char]) if attr_char == 'o': for elem in opened_elements[::-1]: res += '</%s>' % (elem,) @@ -423,7 +427,7 @@ def poezio_colors_to_html(string): else: string = string[next_attr_char+2:] next_attr_char = string.find('\x19') - res += string + res += xml.sax.saxutils.escape(string) for elem in opened_elements[::-1]: res += '</%s>' % (elem,) res += "</p></body>" |