p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r37608] Added some code to make sure 'inline' elements aren't indented (gotta love 

'ignorable' whitespace).

--HG--
branch : trunk
This commit is contained in:
guido 2007-01-30 16:42:19 +01:00
parent 2f8325e277
commit 1ac5c69420
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/xmlobj/html.py
View File

@ -10,6 +10,10 @@ class HtmlVisitor(SimpleUnicodeVisitor):
single = dict([(x, 1) for x in
('br,img,area,param,col,hr,meta,link,base,'
'input,frame').split(',')])
inline = dict([(x, 1) for x in
('a abbr acronym b basefont bdo big br cite code dfn em font '
'i img input kbd label q s samp select small span strike '
'strong sub sup textarea tt u var'.split(' '))])
def repr_attribute(self, attrs, name):
if name == 'class_':
@ -21,6 +25,9 @@ class HtmlVisitor(SimpleUnicodeVisitor):
def _issingleton(self, tagname):
return tagname in self.single
def _isinline(self, tagname):
return tagname in self.inline
class HtmlTag(Tag):
def unicode(self, indent=2):
l = []

6
py/xmlobj/testing/test_html.py
View File

@ -46,3 +46,9 @@ def test_singleton():
h = html.head(html.script(src="foo"))
assert unicode(h) == '<head><script src="foo"></script></head>'
def test_inline():
h = html.div(html.span('foo'), html.span('bar'))
assert (h.unicode(indent=2) ==
'<div><span>foo</span><span>bar</span></div>')

1
py/xmlobj/testing/test_xml.py
View File

@ -55,3 +55,4 @@ def test_raw():
x = ns.some(py.xml.raw("<p>literal</p>"))
u = unicode(x)
assert u == "<some><p>literal</p></some>"

6
py/xmlobj/visit.py
View File

@ -50,7 +50,7 @@ class SimpleUnicodeVisitor(object):
tag.parent = None
self.visited[id(tag)] = 1
tagname = getattr(tag, 'xmlname', tag.__class__.__name__)
if self.curindent:
if self.curindent and not self._isinline(tagname):
self.write("\n" + u' ' * self.curindent)
if tag:
self.curindent += self.indent
@ -100,3 +100,7 @@ class SimpleUnicodeVisitor(object):
"""can (and will) be overridden in subclasses"""
return self.shortempty
def _isinline(self, tagname):
"""can (and will) be overridden in subclasses"""
return False