Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify html_escape using library escape function and string substitutions

Browse Source 
svn: r16751
This commit is contained in:
Gerald Britton 2011-03-03 17:21:53 +00:00
parent eff00c25f5
commit f9179e8186
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/webreport/NarrativeWeb.py
View File

@ -61,6 +61,7 @@ from textwrap import TextWrapper
from unicodedata import normalize
from collections import defaultdict
import re
from xml.sax.saxutils import escape
import operator
from decimal import Decimal
@ -202,11 +203,6 @@ CSS = PLUGMAN.process_plugin_data('WEBSTUFF')
_html_dbl_quotes = re.compile(r'([^"]*) " ([^"]*) " (.*)', re.VERBOSE)
_html_sng_quotes = re.compile(r"([^']*) ' ([^']*) ' (.*)", re.VERBOSE)
_html_replacement = {
"&" : "&",
">" : ">",
"<" : "&#60;",
}
# This command then defines the 'html_escape' option for escaping
# special characters for presentation in HTML based on the above list.
@ -214,24 +210,22 @@ def html_escape(text):
"""Convert the text and replace some characters with a &# variant."""
# First single characters, no quotes
text = ''.join([_html_replacement.get(c, c) for c in text])
text = escape(text)
# Deal with double quotes.
while 1:
m = _html_dbl_quotes.match(text)
while m:
text = "%s" "&#8220;" "%s" "&#8221;" "%s" % m.groups()
m = _html_dbl_quotes.match(text)
if not m:
break
text = m.group(1) + '&#8220;' + m.group(2) + '&#8221;' + m.group(3)
# Replace remaining double quotes.
text = text.replace('"', '&#34;')
# Deal with single quotes.
text = text.replace("'s ", '&#8217;s ')
while 1:
m = _html_sng_quotes.match(text)
while m:
text = "%s" "&#8216;" "%s" "&#8217;" "%s" % m.groups()
m = _html_sng_quotes.match(text)
if not m:
break
text = m.group(1) + '&#8216;' + m.group(2) + '&#8217;' + m.group(3)
# Replace remaining single quotes.
text = text.replace("'", '&#39;')