Mercurial > genshi > mirror
changeset 20:cc92d74ce9e5 trunk
Fix tests broken in [20].
| author | cmlenz |
|---|---|
| date | Mon, 19 Jun 2006 16:38:50 +0000 |
| parents | 704f10b06507 |
| children | b4d17897d053 |
| files | markup/__init__.py markup/builder.py markup/output.py markup/tests/builder.py |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/markup/__init__.py +++ b/markup/__init__.py @@ -47,7 +47,7 @@ `markup.builder` module: >>> from markup.builder import tag ->>> doc = tag.DOC(tag.TITLE('My document'), lang='en') +>>> doc = tag.doc(tag.title('My document'), lang='en') >>> doc.generate().render(method='html') '<doc lang="en"><title>My document</title></doc>'
--- a/markup/builder.py +++ b/markup/builder.py @@ -172,7 +172,7 @@ class ElementFactory(object): def __init__(self, namespace=None): - if not isinstance(namespace, Namespace): + if namespace and not isinstance(namespace, Namespace): namespace = Namespace(namespace) self.namespace = namespace
--- a/markup/output.py +++ b/markup/output.py @@ -37,7 +37,7 @@ """Produces XML text from an event stream. >>> from markup.builder import tag - >>> elem = tag.DIV(tag.A(href='foo'), tag.BR, tag.HR(noshade=True)) + >>> elem = tag.div(tag.a(href='foo'), tag.br, tag.hr(noshade=True)) >>> print ''.join(XMLSerializer().serialize(elem.generate())) <div><a href="foo"/><br/><hr noshade="True"/></div> """ @@ -119,7 +119,7 @@ """Produces HTML text from an event stream. >>> from markup.builder import tag - >>> elem = tag.DIV(tag.A(href='foo'), tag.BR, tag.HR(noshade=True)) + >>> elem = tag.div(tag.a(href='foo'), tag.br, tag.hr(noshade=True)) >>> print ''.join(HTMLSerializer().serialize(elem.generate())) <div><a href="foo"></a><br><hr noshade></div> """
--- a/markup/tests/builder.py +++ b/markup/tests/builder.py @@ -22,7 +22,7 @@ class ElementFactoryTestCase(unittest.TestCase): def test_link(self): - link = tag.A(href='#', title='Foo', accesskey=None)('Bar') + link = tag.a(href='#', title='Foo', accesskey=None)('Bar') bits = iter(link.generate()) self.assertEqual((Stream.START, ('a', [('href', "#"), ('title', "Foo")]), (-1, -1)), bits.next())