Changeset 185:a7e10201fb3c

Timestamp:

Jul 10, 2013, 11:55:33 PM (9 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Do proper fallback for Request.stanzaType.

If stanzaType is not passed to the constructor of
wokkel.generic.Request, it should default to the value in the class
variable, not get.

Author: ralphm
Fixes: #80

Location:

wokkel

Files:

• generic.py (modified) (1 diff)
• test/test_generic.py (modified) (1 diff)
• test/test_muc.py (modified) (1 diff)

wokkel/generic.py

@@ -275 +275 @@
     childParsers = {None: 'parseRequest'}
 
-    def __init__(self, recipient=None, sender=None, stanzaType='get'):
+    def __init__(self, recipient=None, sender=None, stanzaType=None):
         Stanza.__init__(self, recipient=recipient, sender=sender)
-        self.stanzaType = stanzaType
+        if stanzaType is not None:
+            self.stanzaType = stanzaType
 
 

wokkel/test/test_generic.py

@@ -276 +276 @@
 
 
+    def test_stanzaTypeInit(self):
+        """
+        If stanzaType is passed in __init__, it overrides the class variable.
+        """
+
+        class SetRequest(generic.Request):
+            stanzaType = 'set'
+
+        request = SetRequest(stanzaType='get')
+        self.assertEqual('get', request.stanzaType)
+
+
+    def test_stanzaTypeClass(self):
+        """
+        If stanzaType is not passed in __init__, the class variable is used.
+        """
+
+        class SetRequest(generic.Request):
+            stanzaType = 'set'
+
+        request = SetRequest()
+        self.assertEqual('set', request.stanzaType)
+
+
 
 class PrepareIDNNameTests(unittest.TestCase):

wokkel/test/test_muc.py

@@ -1391 +1391 @@
         iq = self.stub.output[-1]
 
-        query = ("/iq/query[@xmlns='%s']/destroy[@xmlns='%s']" %
+        query = ("/iq[@type='set']/query[@xmlns='%s']/destroy[@xmlns='%s']" %
                  (muc.NS_MUC_OWNER, muc.NS_MUC_OWNER))