0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

apos not in name2codepoint, also decode that

Browse source
This commit is contained in:
j 2012-04-24 19:00:48 +02:00
parent 6ed4a2d867
commit 5a00be4b37
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ox/html.py
View file

@ -33,7 +33,7 @@ def escape(html):
'html "test" & <brothers>' 'html "test" & <brothers>'
''' '''
if not isinstance(html, basestring): if not isinstance(html, basestring):
html = str(html) html = str(html)
return html.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&apos;') return html.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&apos;')
def linebreaks(value): def linebreaks(value):
@ -139,6 +139,8 @@ def decodeHtml(html):
u'me & you and $&%' u'me & you and $&%'
>>> decodeHtml('&#x80;') >>> decodeHtml('&#x80;')
u'€' u'€'
>>> decodeHtml('Anniversary of Daoud&apos;s Republic')
u'Anniversary of Daoud's Republic'
""" """
if type(html) != unicode: if type(html) != unicode:
html = unicode(html)[:] html = unicode(html)[:]
@ -156,6 +158,8 @@ def decodeHtml(html):
return uchr(int(entity[1:])) return uchr(int(entity[1:]))
elif entity in name2codepoint: elif entity in name2codepoint:
return uchr(name2codepoint[entity]) return uchr(name2codepoint[entity])
elif entity == 'apos':
return "'"
else: else:
return match.group(0) return match.group(0)
return charrefpat.sub(entitydecode, html).replace(u'\xa0', ' ') return charrefpat.sub(entitydecode, html).replace(u'\xa0', ' ')
@ -211,6 +215,8 @@ def parse_html(html, tags=None, wikilinks=False):
'<b>foo</b>' '<b>foo</b>'
>>> parse_html('<b>foo</b></b>') >>> parse_html('<b>foo</b></b>')
'<b>foo</b>' '<b>foo</b>'
>>> parse_html('Anniversary of Daoud&apos;s Republic')
'Anniversary of Daoud&apos;s Republic'
''' '''
if not tags: if not tags:
tags = [ tags = [