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

compatibility with xhtml "apos" entity and entity decoding speedup.

Browse Source
This commit is contained in:
Michele Comitini
2012-09-22 22:58:55 +02:00
parent 5f7befcfbd
commit 7b373ecb71
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/html.py
+8 -11
View File
@@ -32,6 +32,10 @@ regex_crlf = re.compile('\r|\n')
join = ''.join join = ''.join
entitydefs = dict(map(lambda (k,v): (k, unichr(v)), name2codepoint.iteritems()))
entitydefs.setdefault('apos', u"'")
__all__ = [ __all__ = [
'A', 'A',
'B', 'B',
@@ -243,7 +247,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 +491,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())
@@ -2278,7 +2282,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(
@@ -2404,7 +2408,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].encode('utf8'))
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:
@@ -2508,10 +2512,3 @@ class MARKMIN(XmlComponent):
if __name__ == '__main__': if __name__ == '__main__':
import doctest import doctest
doctest.testmod() doctest.testmod()