dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apos entity fix, thanks Michele

Browse Source
This commit is contained in:
mdipierro
2012-09-24 12:48:39 -05:00
parent b8b2eadf2e
commit 40d3ff40f6
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.9 (2012-09-24 12:44:38) stable Version 2.0.9 (2012-09-24 12:48:35) stable
gluon/compileapp.py
+1 -2
View File
@@ -579,8 +579,7 @@ def run_controller_in(controller, function, environment):
response = environment['response'] response = environment['response']
vars=response._vars vars=response._vars
if response.postprocessing: if response.postprocessing:
for p in response.postprocessing: vars = reduce(lambda vars, p: p(vars), response.postprocessing, vars)
vars = p(vars)
if isinstance(vars,unicode): if isinstance(vars,unicode):
vars = vars.encode('utf8') vars = vars.encode('utf8')
elif hasattr(vars,'xml') and callable(vars.xml): elif hasattr(vars,'xml') and callable(vars.xml):
gluon/html.py
+9 -11
View File
@@ -32,6 +32,11 @@ regex_crlf = re.compile('\r|\n')
join = ''.join 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__ = [ __all__ = [
'A', 'A',
'B', 'B',
@@ -243,7 +248,7 @@ def URL(
elif a and c and not f: (c,f,a)=(a,c,f) elif a and c and not f: (c,f,a)=(a,c,f)
from globals import current from globals import current
if hasattr(current,'request'): if hasattr(current,'request'):
r = current.request r = current.request
if r: if r:
application = r.application application = r.application
@@ -487,7 +492,7 @@ class XmlComponent(object):
components += [other] components += [other]
return CAT(*components) return CAT(*components)
def add_class(self, name): def add_class(self, name):
""" add a class to _class attribute """ """ add a class to _class attribute """
c = self['_class'] c = self['_class']
classes = (set(c.split()) if c else set())|set(name.split()) classes = (set(c.split()) if c else set())|set(name.split())
@@ -2300,7 +2305,7 @@ class MENU(DIV):
select = SELECT(**self.attributes) select = SELECT(**self.attributes)
for item in data: for item in data:
if len(item) <= 4 or item[4] == True: if len(item) <= 4 or item[4] == True:
select.append(OPTION(CAT(prefix, item[0]), select.append(OPTION(CAT(prefix, item[0]),
_value=item[2], _selected=item[1])) _value=item[2], _selected=item[1]))
if len(item)>3 and len(item[3]): if len(item)>3 and len(item[3]):
self.serialize_mobile( self.serialize_mobile(
@@ -2426,7 +2431,7 @@ class web2pyHTMLParser(HTMLParser):
else: else:
self.parent.append(unichr(int(name)).encode('utf8')) self.parent.append(unichr(int(name)).encode('utf8'))
def handle_entityref(self,name): def handle_entityref(self,name):
self.parent.append(unichr(name2codepoint[name]).encode('utf8')) self.parent.append(entitydefs[name])
def handle_endtag(self, tagname): def handle_endtag(self, tagname):
# this deals with unbalanced tags # this deals with unbalanced tags
if tagname==self.last: if tagname==self.last:
@@ -2530,10 +2535,3 @@ class MARKMIN(XmlComponent):
if __name__ == '__main__': if __name__ == '__main__':
import doctest import doctest
doctest.testmod() doctest.testmod()