diff options
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/__init__.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/stanza/__init__.py | 6 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/stanza/pubsub.py | 34 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py | 24 |
4 files changed, 34 insertions, 34 deletions
diff --git a/sleekxmpp/plugins/xep_0060/__init__.py b/sleekxmpp/plugins/xep_0060/__init__.py index a0c91f85..026f7c2b 100644 --- a/sleekxmpp/plugins/xep_0060/__init__.py +++ b/sleekxmpp/plugins/xep_0060/__init__.py @@ -1,2 +1,2 @@ -from pubsub import xep_0060 -import stanza +from sleekxmpp.plugins.xep_0060.pubsub import xep_0060 +from sleekxmpp.plugins.xep_0060 import stanza diff --git a/sleekxmpp/plugins/xep_0060/stanza/__init__.py b/sleekxmpp/plugins/xep_0060/stanza/__init__.py index 52a21efe..d7cd91a8 100644 --- a/sleekxmpp/plugins/xep_0060/stanza/__init__.py +++ b/sleekxmpp/plugins/xep_0060/stanza/__init__.py @@ -1,3 +1,3 @@ -from pubsub import Pubsub, Affiliation, Affiliations, Subscription, Subscriptions, SubscribeOptions, Item, Items, Create, Publish, Retract, Unsubscribe, Subscribe, Configure, Options, PubsubState, PubsubStateEvent -from pubsub_owner import PubsubOwner, DefaultConfig, OwnerAffiliations, OwnerAffiliation, OwnerConfigure, OwnerDefault, OwnerDelete, OwnerPurge, OwnerRedirect, OwnerSubscriptions, OwnerSubscription -from pubsub_event import Event, EventItem, EventRetract, EventItems, EventCollection, EventAssociate, EventDisassociate, EventConfiguration, EventPurge, EventSubscription +from sleekxmpp.plugins.xep_0060.stanza.pubsub import Pubsub, Affiliation, Affiliations, Subscription, Subscriptions, SubscribeOptions, Item, Items, Create, Publish, Retract, Unsubscribe, Subscribe, Configure, Options, PubsubState, PubsubStateEvent +from sleekxmpp.plugins.xep_0060.stanza.pubsub_owner import PubsubOwner, DefaultConfig, OwnerAffiliations, OwnerAffiliation, OwnerConfigure, OwnerDefault, OwnerDelete, OwnerPurge, OwnerRedirect, OwnerSubscriptions, OwnerSubscription +from sleekxmpp.plugins.xep_0060.stanza.pubsub_event import Event, EventItem, EventRetract, EventItems, EventCollection, EventAssociate, EventDisassociate, EventConfiguration, EventPurge, EventSubscription diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py index 4d586cae..96655942 100644 --- a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py +++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py @@ -5,7 +5,7 @@ from sleekxmpp.basexmpp import basexmpp from sleekxmpp.xmlstream.xmlstream import XMLStream import logging from sleekxmpp.plugins import xep_0004 -from base import OptionalSetting +from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting class Pubsub(ElementBase): @@ -55,7 +55,7 @@ class Subscription(ElementBase): def setjid(self, value): self._setattr('jid', str(value)) - + def getjid(self): return jid(self._getattr('jid')) @@ -93,12 +93,12 @@ class Item(ElementBase): def setPayload(self, value): self.xml.append(value) - + def getPayload(self): childs = self.xml.getchildren() if len(childs) > 0: return childs[0] - + def delPayload(self): for child in self.xml.getchildren(): self.xml.remove(child) @@ -167,10 +167,10 @@ class Unsubscribe(ElementBase): interfaces = set(('node', 'jid')) plugin_attrib_map = {} plugin_tag_map = {} - + def setJid(self, value): self._setAttr('jid', str(value)) - + def getJid(self): return JID(self._getAttr('jid')) @@ -186,7 +186,7 @@ class Subscribe(ElementBase): def setJid(self, value): self._setAttr('jid', str(value)) - + def getJid(self): return JID(self._getAttr('jid')) @@ -204,7 +204,7 @@ class Configure(ElementBase): t = self._getAttr('type') if not t: t == 'leaf' return t - + registerStanzaPlugin(Pubsub, Configure) registerStanzaPlugin(Configure, xep_0004.Form) @@ -215,28 +215,28 @@ class Options(ElementBase): interfaces = set(('jid', 'node', 'options')) plugin_attrib_map = {} plugin_tag_map = {} - + def __init__(self, *args, **kwargs): ElementBase.__init__(self, *args, **kwargs) - + def getOptions(self): config = self.xml.find('{jabber:x:data}x') form = xep_0004.Form() if config is not None: form.fromXML(config) return form - + def setOptions(self, value): self.xml.append(value.getXML()) return self - + def delOptions(self): config = self.xml.find('{jabber:x:data}x') self.xml.remove(config) - + def setJid(self, value): self._setAttr('jid', str(value)) - + def getJid(self): return JID(self._getAttr('jid')) @@ -250,15 +250,15 @@ class PubsubState(ElementBase): interfaces = set(('node', 'item', 'payload')) plugin_attrib_map = {} plugin_tag_map = {} - + def setPayload(self, value): self.xml.append(value) - + def getPayload(self): childs = self.xml.getchildren() if len(childs) > 0: return childs[0] - + def delPayload(self): for child in self.xml.getchildren(): self.xml.remove(child) diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py index 05889611..a90780cc 100644 --- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py +++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py @@ -5,8 +5,8 @@ from sleekxmpp.basexmpp import basexmpp from sleekxmpp.xmlstream.xmlstream import XMLStream import logging from sleekxmpp.plugins import xep_0004 -from base import OptionalSetting -from pubsub import Affiliations, Affiliation, Configure, Subscriptions +from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting +from sleekxmpp.plugins.xep_0060.stanza.pubsub import Affiliations, Affiliation, Configure, Subscriptions class PubsubOwner(ElementBase): namespace = 'http://jabber.org/protocol/pubsub#owner' @@ -25,7 +25,7 @@ class DefaultConfig(ElementBase): interfaces = set(('node', 'type', 'config')) plugin_attrib_map = {} plugin_tag_map = {} - + def __init__(self, *args, **kwargs): ElementBase.__init__(self, *args, **kwargs) @@ -33,10 +33,10 @@ class DefaultConfig(ElementBase): t = self._getAttr('type') if not t: t = 'leaf' return t - + def getConfig(self): return self['form'] - + def setConfig(self, value): self['form'].setStanzaValues(value.getStanzaValues()) return self @@ -49,7 +49,7 @@ class OwnerAffiliations(Affiliations): interfaces = set(('node')) plugin_attrib_map = {} plugin_tag_map = {} - + def append(self, affiliation): if not isinstance(affiliation, OwnerAffiliation): raise TypeError @@ -77,10 +77,10 @@ class OwnerDefault(OwnerConfigure): interfaces = set(('node', 'config')) plugin_attrib_map = {} plugin_tag_map = {} - + def getConfig(self): return self['form'] - + def setConfig(self, value): self['form'].setStanzaValues(value.getStanzaValues()) return self @@ -114,10 +114,10 @@ class OwnerRedirect(ElementBase): interfaces = set(('node', 'jid')) plugin_attrib_map = {} plugin_tag_map = {} - + def setJid(self, value): self._setAttr('jid', str(value)) - + def getJid(self): return JID(self._getAttr('jid')) @@ -128,7 +128,7 @@ class OwnerSubscriptions(Subscriptions): interfaces = set(('node',)) plugin_attrib_map = {} plugin_tag_map = {} - + def append(self, subscription): if not isinstance(subscription, OwnerSubscription): raise TypeError @@ -147,6 +147,6 @@ class OwnerSubscription(ElementBase): def setJid(self, value): self._setAttr('jid', str(value)) - + def getJid(self): return JID(self._getAttr('from')) |