html patch, thanks Jonathan, but TRHEAD commented
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.6.0-development+timestamp.2013.07.11.09.13.54
|
Version 2.6.0-development+timestamp.2013.07.11.11.27.25
|
||||||
|
|||||||
+20
-4
@@ -98,6 +98,7 @@ __all__ = [
|
|||||||
'TFOOT',
|
'TFOOT',
|
||||||
'TITLE',
|
'TITLE',
|
||||||
'TR',
|
'TR',
|
||||||
|
# 'TRHEAD',
|
||||||
'TT',
|
'TT',
|
||||||
'URL',
|
'URL',
|
||||||
'XHTML',
|
'XHTML',
|
||||||
@@ -1198,12 +1199,12 @@ def TAG_pickler(data):
|
|||||||
return (TAG_unpickler, (marshal_dump,))
|
return (TAG_unpickler, (marshal_dump,))
|
||||||
|
|
||||||
|
|
||||||
class __tag__(DIV):
|
class __tag_div__(DIV):
|
||||||
def __init__(self,name,*a,**b):
|
def __init__(self,name,*a,**b):
|
||||||
DIV.__init__(self,*a,**b)
|
DIV.__init__(self,*a,**b)
|
||||||
self.tag = name
|
self.tag = name
|
||||||
|
|
||||||
copy_reg.pickle(__tag__, TAG_pickler, TAG_unpickler)
|
copy_reg.pickle(__tag_div__, TAG_pickler, TAG_unpickler)
|
||||||
|
|
||||||
class __TAG__(XmlComponent):
|
class __TAG__(XmlComponent):
|
||||||
|
|
||||||
@@ -1223,7 +1224,7 @@ class __TAG__(XmlComponent):
|
|||||||
name = name[:-1] + '/'
|
name = name[:-1] + '/'
|
||||||
if isinstance(name, unicode):
|
if isinstance(name, unicode):
|
||||||
name = name.encode('utf-8')
|
name = name.encode('utf-8')
|
||||||
return lambda *a,**b: __tag__(name,*a,**b)
|
return lambda *a,**b: __tag_div__(name,*a,**b)
|
||||||
|
|
||||||
def __call__(self, html):
|
def __call__(self, html):
|
||||||
return web2pyHTMLParser(decoder.decoder(html)).tree
|
return web2pyHTMLParser(decoder.decoder(html)).tree
|
||||||
@@ -1640,12 +1641,27 @@ class TR(DIV):
|
|||||||
self._wrap_components((TD, TH), TD)
|
self._wrap_components((TD, TH), TD)
|
||||||
|
|
||||||
|
|
||||||
|
class TRHEAD(DIV):
|
||||||
|
"""
|
||||||
|
TRHEAD Component.
|
||||||
|
|
||||||
|
If subcomponents are not TD/TH-components they will be wrapped in a TH
|
||||||
|
|
||||||
|
see also :class:`DIV`
|
||||||
|
"""
|
||||||
|
|
||||||
|
tag = 'tr'
|
||||||
|
|
||||||
|
def _fixup(self):
|
||||||
|
self._wrap_components((TD, TH), TH)
|
||||||
|
|
||||||
|
|
||||||
class THEAD(DIV):
|
class THEAD(DIV):
|
||||||
|
|
||||||
tag = 'thead'
|
tag = 'thead'
|
||||||
|
|
||||||
def _fixup(self):
|
def _fixup(self):
|
||||||
self._wrap_components(TR, TR)
|
self._wrap_components((TRHEAD, TR), TRHEAD)
|
||||||
|
|
||||||
|
|
||||||
class TBODY(DIV):
|
class TBODY(DIV):
|
||||||
|
|||||||
@@ -188,6 +188,10 @@ class TestBareHelpers(unittest.TestCase):
|
|||||||
|
|
||||||
def testTHEAD(self):
|
def testTHEAD(self):
|
||||||
self.assertEqual(THEAD('<>', _a='1', _b='2').xml(),
|
self.assertEqual(THEAD('<>', _a='1', _b='2').xml(),
|
||||||
|
'<thead a="1" b="2"><tr><th><></th></tr></thead>')
|
||||||
|
#self.assertEqual(THEAD(TRHEAD('<>'), _a='1', _b='2').xml(),
|
||||||
|
# '<thead a="1" b="2"><tr><th><></th></tr></thead>')
|
||||||
|
self.assertEqual(THEAD(TR('<>'), _a='1', _b='2').xml(),
|
||||||
'<thead a="1" b="2"><tr><td><></td></tr></thead>')
|
'<thead a="1" b="2"><tr><td><></td></tr></thead>')
|
||||||
|
|
||||||
def testTITLE(self):
|
def testTITLE(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user