Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

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 = {}
 

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>""")