Some more minor cleanup.

2 files changed, 11 insertions, 10 deletions

diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
index 45781c44..f7563ecb 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
@@ -15,14 +15,14 @@ from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting
 class Pubsub(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'pubsub'
-    plugin_attrib = 'pubsub'
+    plugin_attrib = name
     interfaces = set(tuple())
 
 
 class Affiliations(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'affiliations'
-    plugin_attrib = 'affiliations'
+    plugin_attrib = name
     interfaces = set(('node',))
 
 
@@ -55,7 +55,7 @@ class Subscription(ElementBase):
 class Subscriptions(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'subscriptions'
-    plugin_attrib = 'subscriptions'
+    plugin_attrib = name
     interfaces = set(('node',))
 
 
@@ -89,7 +89,7 @@ class Item(ElementBase):
 class Items(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'items'
-    plugin_attrib = 'items'
+    plugin_attrib = name
     interfaces = set(('node', 'max_items'))
 
     def set_max_items(self, value):
@@ -189,7 +189,7 @@ class Configure(ElementBase):
 class Options(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'options'
-    plugin_attrib = 'options'
+    plugin_attrib = name
     interfaces = set(('jid', 'node', 'options'))
 
     def __init__(self, *args, **kwargs):
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py
index 2234214f..4a35db9d 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py
@@ -10,7 +10,8 @@ from sleekxmpp import Iq
 from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
 from sleekxmpp.plugins.xep_0004 import Form
 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):
@@ -23,7 +24,7 @@ class PubsubOwner(ElementBase):
 class DefaultConfig(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'default'
-    plugin_attrib = 'default'
+    plugin_attrib = name
     interfaces = set(('node', 'config'))
 
     def __init__(self, *args, **kwargs):
@@ -55,7 +56,7 @@ class OwnerAffiliation(Affiliation):
 class OwnerConfigure(Configure):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'configure'
-    plugin_attrib = 'configure'
+    plugin_attrib = name
     interfaces = set(('node',))
 
 
@@ -67,15 +68,15 @@ class OwnerDefault(OwnerConfigure):
 class OwnerDelete(ElementBase, OptionalSetting):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'delete'
-    plugin_attrib = 'delete'
+    plugin_attrib = name
     interfaces = set(('node',))
 
 
 class OwnerPurge(ElementBase, OptionalSetting):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'purge'
-    interfaces = set(('node',))
     plugin_attrib = name
+    interfaces = set(('node',))
 
 
 class OwnerRedirect(ElementBase):