# HG changeset patch
# User cmlenz
# Date 1150735130 0
# Node ID cc92d74ce9e5253d746b5c8dd97e1e4115a88126
# Parent  704f10b0650708c9f924819e61236eb54d941b7e
Fix tests broken in [20].

diff --git a/markup/__init__.py b/markup/__init__.py
--- 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>'
 
diff --git a/markup/builder.py b/markup/builder.py
--- 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
 
diff --git a/markup/output.py b/markup/output.py
--- 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>
     """
diff --git a/markup/tests/builder.py b/markup/tests/builder.py
--- 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())