Fix imports for xep_0060

This commit is contained in:
Lance Stout 2011-08-04 11:38:14 -07:00
parent 9ffdba8643
commit 7cd39a6aad
4 changed files with 34 additions and 34 deletions

View file

@ -1,2 +1,2 @@
from pubsub import xep_0060 from sleekxmpp.plugins.xep_0060.pubsub import xep_0060
import stanza from sleekxmpp.plugins.xep_0060 import stanza

View file

@ -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 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 pubsub_owner import PubsubOwner, DefaultConfig, OwnerAffiliations, OwnerAffiliation, OwnerConfigure, OwnerDefault, OwnerDelete, OwnerPurge, OwnerRedirect, OwnerSubscriptions, OwnerSubscription from sleekxmpp.plugins.xep_0060.stanza.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_event import Event, EventItem, EventRetract, EventItems, EventCollection, EventAssociate, EventDisassociate, EventConfiguration, EventPurge, EventSubscription

View file

@ -5,7 +5,7 @@ from sleekxmpp.basexmpp import basexmpp
from sleekxmpp.xmlstream.xmlstream import XMLStream from sleekxmpp.xmlstream.xmlstream import XMLStream
import logging import logging
from sleekxmpp.plugins import xep_0004 from sleekxmpp.plugins import xep_0004
from base import OptionalSetting from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting
class Pubsub(ElementBase): class Pubsub(ElementBase):
@ -55,7 +55,7 @@ class Subscription(ElementBase):
def setjid(self, value): def setjid(self, value):
self._setattr('jid', str(value)) self._setattr('jid', str(value))
def getjid(self): def getjid(self):
return jid(self._getattr('jid')) return jid(self._getattr('jid'))
@ -93,12 +93,12 @@ class Item(ElementBase):
def setPayload(self, value): def setPayload(self, value):
self.xml.append(value) self.xml.append(value)
def getPayload(self): def getPayload(self):
childs = self.xml.getchildren() childs = self.xml.getchildren()
if len(childs) > 0: if len(childs) > 0:
return childs[0] return childs[0]
def delPayload(self): def delPayload(self):
for child in self.xml.getchildren(): for child in self.xml.getchildren():
self.xml.remove(child) self.xml.remove(child)
@ -167,10 +167,10 @@ class Unsubscribe(ElementBase):
interfaces = set(('node', 'jid')) interfaces = set(('node', 'jid'))
plugin_attrib_map = {} plugin_attrib_map = {}
plugin_tag_map = {} plugin_tag_map = {}
def setJid(self, value): def setJid(self, value):
self._setAttr('jid', str(value)) self._setAttr('jid', str(value))
def getJid(self): def getJid(self):
return JID(self._getAttr('jid')) return JID(self._getAttr('jid'))
@ -186,7 +186,7 @@ class Subscribe(ElementBase):
def setJid(self, value): def setJid(self, value):
self._setAttr('jid', str(value)) self._setAttr('jid', str(value))
def getJid(self): def getJid(self):
return JID(self._getAttr('jid')) return JID(self._getAttr('jid'))
@ -204,7 +204,7 @@ class Configure(ElementBase):
t = self._getAttr('type') t = self._getAttr('type')
if not t: t == 'leaf' if not t: t == 'leaf'
return t return t
registerStanzaPlugin(Pubsub, Configure) registerStanzaPlugin(Pubsub, Configure)
registerStanzaPlugin(Configure, xep_0004.Form) registerStanzaPlugin(Configure, xep_0004.Form)
@ -215,28 +215,28 @@ class Options(ElementBase):
interfaces = set(('jid', 'node', 'options')) interfaces = set(('jid', 'node', 'options'))
plugin_attrib_map = {} plugin_attrib_map = {}
plugin_tag_map = {} plugin_tag_map = {}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
ElementBase.__init__(self, *args, **kwargs) ElementBase.__init__(self, *args, **kwargs)
def getOptions(self): def getOptions(self):
config = self.xml.find('{jabber:x:data}x') config = self.xml.find('{jabber:x:data}x')
form = xep_0004.Form() form = xep_0004.Form()
if config is not None: if config is not None:
form.fromXML(config) form.fromXML(config)
return form return form
def setOptions(self, value): def setOptions(self, value):
self.xml.append(value.getXML()) self.xml.append(value.getXML())
return self return self
def delOptions(self): def delOptions(self):
config = self.xml.find('{jabber:x:data}x') config = self.xml.find('{jabber:x:data}x')
self.xml.remove(config) self.xml.remove(config)
def setJid(self, value): def setJid(self, value):
self._setAttr('jid', str(value)) self._setAttr('jid', str(value))
def getJid(self): def getJid(self):
return JID(self._getAttr('jid')) return JID(self._getAttr('jid'))
@ -250,15 +250,15 @@ class PubsubState(ElementBase):
interfaces = set(('node', 'item', 'payload')) interfaces = set(('node', 'item', 'payload'))
plugin_attrib_map = {} plugin_attrib_map = {}
plugin_tag_map = {} plugin_tag_map = {}
def setPayload(self, value): def setPayload(self, value):
self.xml.append(value) self.xml.append(value)
def getPayload(self): def getPayload(self):
childs = self.xml.getchildren() childs = self.xml.getchildren()
if len(childs) > 0: if len(childs) > 0:
return childs[0] return childs[0]
def delPayload(self): def delPayload(self):
for child in self.xml.getchildren(): for child in self.xml.getchildren():
self.xml.remove(child) self.xml.remove(child)

View file

@ -5,8 +5,8 @@ from sleekxmpp.basexmpp import basexmpp
from sleekxmpp.xmlstream.xmlstream import XMLStream from sleekxmpp.xmlstream.xmlstream import XMLStream
import logging import logging
from sleekxmpp.plugins import xep_0004 from sleekxmpp.plugins import xep_0004
from base import OptionalSetting from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting
from pubsub import Affiliations, Affiliation, Configure, Subscriptions from sleekxmpp.plugins.xep_0060.stanza.pubsub import Affiliations, Affiliation, Configure, Subscriptions
class PubsubOwner(ElementBase): class PubsubOwner(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub#owner' namespace = 'http://jabber.org/protocol/pubsub#owner'
@ -25,7 +25,7 @@ class DefaultConfig(ElementBase):
interfaces = set(('node', 'type', 'config')) interfaces = set(('node', 'type', 'config'))
plugin_attrib_map = {} plugin_attrib_map = {}
plugin_tag_map = {} plugin_tag_map = {}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
ElementBase.__init__(self, *args, **kwargs) ElementBase.__init__(self, *args, **kwargs)
@ -33,10 +33,10 @@ class DefaultConfig(ElementBase):
t = self._getAttr('type') t = self._getAttr('type')
if not t: t = 'leaf' if not t: t = 'leaf'
return t return t
def getConfig(self): def getConfig(self):
return self['form'] return self['form']
def setConfig(self, value): def setConfig(self, value):
self['form'].setStanzaValues(value.getStanzaValues()) self['form'].setStanzaValues(value.getStanzaValues())
return self return self
@ -49,7 +49,7 @@ class OwnerAffiliations(Affiliations):
interfaces = set(('node')) interfaces = set(('node'))
plugin_attrib_map = {} plugin_attrib_map = {}
plugin_tag_map = {} plugin_tag_map = {}
def append(self, affiliation): def append(self, affiliation):
if not isinstance(affiliation, OwnerAffiliation): if not isinstance(affiliation, OwnerAffiliation):
raise TypeError raise TypeError
@ -77,10 +77,10 @@ class OwnerDefault(OwnerConfigure):
interfaces = set(('node', 'config')) interfaces = set(('node', 'config'))
plugin_attrib_map = {} plugin_attrib_map = {}
plugin_tag_map = {} plugin_tag_map = {}
def getConfig(self): def getConfig(self):
return self['form'] return self['form']
def setConfig(self, value): def setConfig(self, value):
self['form'].setStanzaValues(value.getStanzaValues()) self['form'].setStanzaValues(value.getStanzaValues())
return self return self
@ -114,10 +114,10 @@ class OwnerRedirect(ElementBase):
interfaces = set(('node', 'jid')) interfaces = set(('node', 'jid'))
plugin_attrib_map = {} plugin_attrib_map = {}
plugin_tag_map = {} plugin_tag_map = {}
def setJid(self, value): def setJid(self, value):
self._setAttr('jid', str(value)) self._setAttr('jid', str(value))
def getJid(self): def getJid(self):
return JID(self._getAttr('jid')) return JID(self._getAttr('jid'))
@ -128,7 +128,7 @@ class OwnerSubscriptions(Subscriptions):
interfaces = set(('node',)) interfaces = set(('node',))
plugin_attrib_map = {} plugin_attrib_map = {}
plugin_tag_map = {} plugin_tag_map = {}
def append(self, subscription): def append(self, subscription):
if not isinstance(subscription, OwnerSubscription): if not isinstance(subscription, OwnerSubscription):
raise TypeError raise TypeError
@ -147,6 +147,6 @@ class OwnerSubscription(ElementBase):
def setJid(self, value): def setJid(self, value):
self._setAttr('jid', str(value)) self._setAttr('jid', str(value))
def getJid(self): def getJid(self):
return JID(self._getAttr('from')) return JID(self._getAttr('from'))