Merge branch 'master' into develop

Conflicts:
	sleekxmpp/basexmpp.py

1 files changed, 40 insertions, 0 deletions

diff --git a/sleekxmpp/plugins/xep_0258/security_labels.py b/sleekxmpp/plugins/xep_0258/security_labels.py
new file mode 100644
index 00000000..e0426f32
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0258/security_labels.py
@@ -0,0 +1,40 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+import logging
+
+from sleekxmpp import Iq, Message
+from sleekxmpp.plugins import BasePlugin
+from sleekxmpp.xmlstream import register_stanza_plugin
+from sleekxmpp.plugins.xep_0258 import stanza, SecurityLabel, Catalog
+
+
+log = logging.getLogger(__name__)
+
+
+class XEP_0258(BasePlugin):
+
+    name = 'xep_0258'
+    description = 'XEP-0258: Security Labels in XMPP'
+    dependencies = set(['xep_0030'])
+    stanza = stanza
+
+    def plugin_init(self):
+        self.xmpp['xep_0030'].add_feature(SecurityLabel.namespace)
+
+        register_stanza_plugin(Message, SecurityLabel)
+        register_stanza_plugin(Iq, Catalog)
+
+    def get_catalog(self, jid, ifrom=None, block=True,
+                          callback=None, timeout=None):
+        iq = self.xmpp.Iq()
+        iq['to'] = jid
+        iq['from'] = ifrom
+        iq['type'] = 'get'
+        iq.enable('security_label_catalog')
+        return iq.send(block=block, callback=callback, timeout=timeout)