apos entity fix, thanks Michele
This commit is contained in:
1 parent
8f382f322e
commit
80040bf8e5
3 files changed
+8
-11
No files matched your search
@@ -1 +1 @@
|
||||
Version 2.0.9 (2012-09-24 12:44:38) stable
|
||||
Version 2.0.9 (2012-09-24 12:48:35) stable
|
||||
+1
-2
@@ -579,8 +579,7 @@ def run_controller_in(controller, function, environment):
|
||||
response = environment['response']
|
||||
vars=response._vars
|
||||
if response.postprocessing:
|
||||
for p in response.postprocessing:
|
||||
vars = p(vars)
|
||||
vars = reduce(lambda vars, p: p(vars), response.postprocessing, vars)
|
||||
if isinstance(vars,unicode):
|
||||
vars = vars.encode('utf8')
|
||||
elif hasattr(vars,'xml') and callable(vars.xml):
|
||||
|
||||
+6
-8
@@ -32,6 +32,11 @@ regex_crlf = re.compile('\r|\n')
|
||||
|
||||
join = ''.join
|
||||
|
||||
# name2codepoint is incomplete respect to xhtml (and xml): 'apos' is missing.
|
||||
entitydefs = dict(map(lambda (k,v): (k, unichr(v).encode('utf-8')), name2codepoint.iteritems()))
|
||||
entitydefs.setdefault('apos', u"'".encode('utf-8'))
|
||||
|
||||
|
||||
__all__ = [
|
||||
'A',
|
||||
'B',
|
||||
@@ -2426,7 +2431,7 @@ class web2pyHTMLParser(HTMLParser):
|
||||
else:
|
||||
self.parent.append(unichr(int(name)).encode('utf8'))
|
||||
def handle_entityref(self,name):
|
||||
self.parent.append(unichr(name2codepoint[name]).encode('utf8'))
|
||||
self.parent.append(entitydefs[name])
|
||||
def handle_endtag(self, tagname):
|
||||
# this deals with unbalanced tags
|
||||
if tagname==self.last:
|
||||
@@ -2530,10 +2535,3 @@ class MARKMIN(XmlComponent):
|
||||
if __name__ == '__main__':
|
||||
import doctest
|
||||
doctest.testmod()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user