Ticket #258: markup-join-typeerror.patch

genshi/_speedups.c

@@ -238 +238 @@
         return NULL;
     }
     if (!PySequence_Check(seq)) {
+        PyErr_FromString(PyExc_TypeError, "a sequence is required");
         return NULL;
     }
     n = PySequence_Size(seq);

genshi/tests/core.py

@@ -136 +136 @@
         assert type(markup) is Markup
         self.assertEquals('foo<br />&lt;bar /&gt;<br /><baz />', markup)
 
+    def test_join_wrongtype(self):
+        """
+        Tests calling Markup.join with an argument whose type is nonsensical.
+        """
+        self.assertRaises(TypeError, lambda: Markup('<br />').join(0.5))
+
     def test_stripentities_all(self):
         markup = Markup('&amp; &#106;').stripentities()
         assert type(markup) is Markup