Some more minor cleanup.

This commit is contained in:
Lance Stout 2011-09-01 14:03:11 -07:00
parent 24c5f8d374
commit 39ec1cff19
2 changed files with 11 additions and 10 deletions

View file

@ -15,14 +15,14 @@ from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting
class Pubsub(ElementBase): class Pubsub(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub' namespace = 'http://jabber.org/protocol/pubsub'
name = 'pubsub' name = 'pubsub'
plugin_attrib = 'pubsub' plugin_attrib = name
interfaces = set(tuple()) interfaces = set(tuple())
class Affiliations(ElementBase): class Affiliations(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub' namespace = 'http://jabber.org/protocol/pubsub'
name = 'affiliations' name = 'affiliations'
plugin_attrib = 'affiliations' plugin_attrib = name
interfaces = set(('node',)) interfaces = set(('node',))
@ -55,7 +55,7 @@ class Subscription(ElementBase):
class Subscriptions(ElementBase): class Subscriptions(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub' namespace = 'http://jabber.org/protocol/pubsub'
name = 'subscriptions' name = 'subscriptions'
plugin_attrib = 'subscriptions' plugin_attrib = name
interfaces = set(('node',)) interfaces = set(('node',))
@ -89,7 +89,7 @@ class Item(ElementBase):
class Items(ElementBase): class Items(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub' namespace = 'http://jabber.org/protocol/pubsub'
name = 'items' name = 'items'
plugin_attrib = 'items' plugin_attrib = name
interfaces = set(('node', 'max_items')) interfaces = set(('node', 'max_items'))
def set_max_items(self, value): def set_max_items(self, value):
@ -189,7 +189,7 @@ class Configure(ElementBase):
class Options(ElementBase): class Options(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub' namespace = 'http://jabber.org/protocol/pubsub'
name = 'options' name = 'options'
plugin_attrib = 'options' plugin_attrib = name
interfaces = set(('jid', 'node', 'options')) interfaces = set(('jid', 'node', 'options'))
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

View file

@ -10,7 +10,8 @@ from sleekxmpp import Iq
from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
from sleekxmpp.plugins.xep_0004 import Form from sleekxmpp.plugins.xep_0004 import Form
from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting
from sleekxmpp.plugins.xep_0060.stanza.pubsub import Affiliations, Affiliation, Configure, Subscriptions from sleekxmpp.plugins.xep_0060.stanza.pubsub import Affiliations, Affiliation
from sleekxmpp.plugins.xep_0060.stanza.pubsub import Configure, Subscriptions
class PubsubOwner(ElementBase): class PubsubOwner(ElementBase):
@ -23,7 +24,7 @@ class PubsubOwner(ElementBase):
class DefaultConfig(ElementBase): class DefaultConfig(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub#owner' namespace = 'http://jabber.org/protocol/pubsub#owner'
name = 'default' name = 'default'
plugin_attrib = 'default' plugin_attrib = name
interfaces = set(('node', 'config')) interfaces = set(('node', 'config'))
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -55,7 +56,7 @@ class OwnerAffiliation(Affiliation):
class OwnerConfigure(Configure): class OwnerConfigure(Configure):
namespace = 'http://jabber.org/protocol/pubsub#owner' namespace = 'http://jabber.org/protocol/pubsub#owner'
name = 'configure' name = 'configure'
plugin_attrib = 'configure' plugin_attrib = name
interfaces = set(('node',)) interfaces = set(('node',))
@ -67,15 +68,15 @@ class OwnerDefault(OwnerConfigure):
class OwnerDelete(ElementBase, OptionalSetting): class OwnerDelete(ElementBase, OptionalSetting):
namespace = 'http://jabber.org/protocol/pubsub#owner' namespace = 'http://jabber.org/protocol/pubsub#owner'
name = 'delete' name = 'delete'
plugin_attrib = 'delete' plugin_attrib = name
interfaces = set(('node',)) interfaces = set(('node',))
class OwnerPurge(ElementBase, OptionalSetting): class OwnerPurge(ElementBase, OptionalSetting):
namespace = 'http://jabber.org/protocol/pubsub#owner' namespace = 'http://jabber.org/protocol/pubsub#owner'
name = 'purge' name = 'purge'
interfaces = set(('node',))
plugin_attrib = name plugin_attrib = name
interfaces = set(('node',))
class OwnerRedirect(ElementBase): class OwnerRedirect(ElementBase):