Changeset 2711:113988ef6cf0 in livinglogic.python.xist

Timestamp:

06/22/07 18:38:16 (12 years ago)

Author:

Walter Doerwald <walter@…>

Branch:

default

Message:

Raise error in tonode() instead of issueing a warning.

Remove second implementation for Attrs.iter() (which was wrong).

Raise an error for Attrs passed to tonode().

Files:

• src/ll/xist/xsc.py (modified) (5 diffs)
• test/test_xist.py (modified) (1 diff)

src/ll/xist/xsc.py

@@ -70 +70 @@
     if isinstance(value, Node):
         if isinstance(value, Attrs):
-            raise TypeError("cannot convert %r" % value)
+            raise IllegalObjectError(value)
         # we don't have to turn an Attr into a Frag, because this will be done once the Attr is put back into the tree
         return value
@@ -87 +87 @@
         except TypeError:
             pass
-    warnings.warn(IllegalObjectWarning(value)) # none of the above, so we report it and maybe throw an exception
-    return Null
+    raise IllegalObjectError(value) # none of the above => bail out
 
 
@@ -463 +462 @@
 
 
-class IllegalObjectWarning(Warning):
-    """
-    Warning that is issued when &xist; finds an illegal object in its object tree.
+class IllegalObjectError(TypeError):
+    """
+    Exception that is raised when an &xist; constructor gets passed an unconvertable object.
     """
 
@@ -472 +471 @@
 
     def __str__(self):
-        return "an illegal object %r of type %s has been found in the XIST tree." % (self.object, type(self.object).__name__)
+        return "can't convert object %r of type %s to an XIST node" % (self.object, type(self.object).__name__)
 
 
@@ -2661 +2660 @@
             loc = ""
         return "<%s.%s attrs %s%s at 0x%x>" % (self.__class__.__module__, self.__fullname__, info, loc, id(self))
-
-    def __iter__(self):
-        return self.itervalues()
 
 

test/test_xist.py

@@ -62 +62 @@
         node.append(html.p.Attrs.id(7))
         check_lenunicode(node, 7, u"1234567")
-        py.test.raises(TypeError, node.append, xml.Attrs(lang="de"))
+        py.test.raises(TypeError, node.append, xml.Attrs(lang=8))