Changeset 212:af4ef4a0fd7f for wokkel

Timestamp:

Oct 3, 2016, 9:33:18 AM (4 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Replace basestring with StringType and add tests.

Location:

wokkel

Files:

• pubsub.py (modified) (2 diffs)
• test/test_pubsub.py (modified) (1 diff)

wokkel/pubsub.py

@@ -17 +17 @@
 from twisted.internet import defer
 from twisted.python import log
-from twisted.python.compat import iteritems, unicode
+from twisted.python.compat import StringType, iteritems, unicode
 from twisted.words.protocols.jabber import jid, error
 from twisted.words.xish import domish
@@ -182 +182 @@
             self['id'] = id
         if payload is not None:
-            if isinstance(payload, basestring):
+            if isinstance(payload, StringType):
                 self.addRawXml(payload)
             else:

wokkel/test/test_pubsub.py

@@ -115 +115 @@
         element = subscription.toElement()
         self.assertEqual('1234', element.getAttribute('subid'))
+
+
+
+class ItemTests(unittest.TestCase):
+    """
+    Tests for L{pubsub.Item}.
+    """
+
+    def test_payloadRaw(self):
+        """
+        Adding a payload as a string assumes serialized XML.
+        """
+        payload = "<test xmlns='foo'/>"
+        item = pubsub.Item(payload=payload)
+        self.assertEqual(payload, item.children[0])
+
+
+    def test_payloadElement(self):
+        """
+        Adding a payload as an domish Element, just adds that element as child.
+        """
+        payload = domish.Element(('foo', 'test'))
+        item = pubsub.Item(payload=payload)
+        self.assertIs(payload, item.children[0])