diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-30 23:03:51 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-30 23:03:51 -0700 |
| commit | e0a1c477d03ab353107cd8cf5bb420edc2262a97 (patch) | |
| tree | 00ea493c15f3a56a49a9e425c179bc75e678027c | |
| parent | 33ac0c9dd60192c513617d0108c152bd8b75237b (diff) | |
| parent | b70565720fe7d83fdb5de880607a48a37c126d89 (diff) | |
| download | slixmpp-e0a1c477d03ab353107cd8cf5bb420edc2262a97.tar.gz slixmpp-e0a1c477d03ab353107cd8cf5bb420edc2262a97.tar.bz2 slixmpp-e0a1c477d03ab353107cd8cf5bb420edc2262a97.tar.xz slixmpp-e0a1c477d03ab353107cd8cf5bb420edc2262a97.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/stanza/pubsub.py | 3 | ||||
| -rw-r--r-- | tests/test_stanza_xep_0060.py | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py index 4967e1a7..d2da8ec9 100644 --- a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py +++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py @@ -247,7 +247,8 @@ class PublishOptions(ElementBase): namespace = 'http://jabber.org/protocol/pubsub' name = 'publish-options' plugin_attrib = 'publish_options' - interfaces = set(('publish_options')) + interfaces = set(('publish_options',)) + is_extension = True plugin_attrib_map = {} plugin_tag_map = {} diff --git a/tests/test_stanza_xep_0060.py b/tests/test_stanza_xep_0060.py index 2427b787..5d5c843a 100644 --- a/tests/test_stanza_xep_0060.py +++ b/tests/test_stanza_xep_0060.py @@ -213,6 +213,9 @@ class TestPubsubStanzas(SleekTest): item2['payload'] = payload2 iq['pubsub']['publish'].append(item) iq['pubsub']['publish'].append(item2) + form = xep_0004.Form() + form.addField('pubsub#description', ftype='text-single', value='this thing is awesome') + iq['pubsub']['publish_options'] = form self.check(iq, """ <iq id="0"> @@ -231,6 +234,13 @@ class TestPubsubStanzas(SleekTest): </thinger2> </item> </publish> + <publish-options> + <x xmlns="jabber:x:data" type="submit"> + <field var="pubsub#description"> + <value>this thing is awesome</value> + </field> + </x> + </publish-options> </pubsub> </iq>""") |