fixed indenting and merged in exceptions branch

2 files changed, 249 insertions, 249 deletions

diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
index 68e4f952..d9e55052 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
@@ -9,236 +9,236 @@ from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting
 
 
 class Pubsub(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'pubsub'
-	plugin_attrib = 'pubsub'
-	interfaces = set(tuple())
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'pubsub'
+    plugin_attrib = 'pubsub'
+    interfaces = set(tuple())
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
 registerStanzaPlugin(Iq, Pubsub)
 
 
 class Affiliation(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'affiliation'
-	plugin_attrib = name
-	interfaces = set(('node', 'affiliation', 'jid'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-	
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'affiliation'
+    plugin_attrib = name
+    interfaces = set(('node', 'affiliation', 'jid'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+    
     def setJid(self, value):
-		self._setAttr('jid', str(value))
+        self._setAttr('jid', str(value))
 
-	def getJid(self):
-		return JID(self._getAttr('jid'))
+    def getJid(self):
+        return JID(self._getAttr('jid'))
 
 class Affiliations(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'affiliations'
-	plugin_attrib = 'affiliations'
-	interfaces = set(tuple())
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-	subitem = (Affiliation,)
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'affiliations'
+    plugin_attrib = 'affiliations'
+    interfaces = set(tuple())
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+    subitem = (Affiliation,)
 
 registerStanzaPlugin(Pubsub, Affiliations)
 
 
 class Subscription(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'subscription'
-	plugin_attrib = name
-	interfaces = set(('jid', 'node', 'subscription', 'subid'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'subscription'
+    plugin_attrib = name
+    interfaces = set(('jid', 'node', 'subscription', 'subid'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
-	def setjid(self, value):
-		self._setattr('jid', str(value))
+    def setjid(self, value):
+        self._setattr('jid', str(value))
 
-	def getjid(self):
-		return jid(self._getattr('jid'))
+    def getjid(self):
+        return jid(self._getattr('jid'))
 
 registerStanzaPlugin(Pubsub, Subscription)
 
 class Subscriptions(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'subscriptions'
-	plugin_attrib = 'subscriptions'
-	interfaces = set(tuple())
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-	subitem = (Subscription,)
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'subscriptions'
+    plugin_attrib = 'subscriptions'
+    interfaces = set(tuple())
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+    subitem = (Subscription,)
 
 registerStanzaPlugin(Pubsub, Subscriptions)
 
 
 class SubscribeOptions(ElementBase, OptionalSetting):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'subscribe-options'
-	plugin_attrib = 'suboptions'
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-	interfaces = set(('required',))
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'subscribe-options'
+    plugin_attrib = 'suboptions'
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+    interfaces = set(('required',))
 
 registerStanzaPlugin(Subscription, SubscribeOptions)
 
 class Item(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'item'
-	plugin_attrib = name
-	interfaces = set(('id', 'payload'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'item'
+    plugin_attrib = name
+    interfaces = set(('id', 'payload'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
-	def setPayload(self, value):
-		self.xml.append(value)
+    def setPayload(self, value):
+        self.xml.append(value)
 
-	def getPayload(self):
-		childs = self.xml.getchildren()
-		if len(childs) > 0:
-			return childs[0]
+    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)
+    def delPayload(self):
+        for child in self.xml.getchildren():
+            self.xml.remove(child)
 
 class Items(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'items'
-	plugin_attrib = 'items'
-	interfaces = set(('node',))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-	subitem = (Item,)
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'items'
+    plugin_attrib = 'items'
+    interfaces = set(('node',))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+    subitem = (Item,)
 
 registerStanzaPlugin(Pubsub, Items)
 
 class Create(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'create'
-	plugin_attrib = name
-	interfaces = set(('node',))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'create'
+    plugin_attrib = name
+    interfaces = set(('node',))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
 registerStanzaPlugin(Pubsub, Create)
 
 #class Default(ElementBase):
-#	namespace = 'http://jabber.org/protocol/pubsub'
-#	name = 'default'
-#	plugin_attrib = name
-#	interfaces = set(('node', 'type'))
-#	plugin_attrib_map = {}
-#	plugin_tag_map = {}
+#    namespace = 'http://jabber.org/protocol/pubsub'
+#    name = 'default'
+#    plugin_attrib = name
+#    interfaces = set(('node', 'type'))
+#    plugin_attrib_map = {}
+#    plugin_tag_map = {}
 #
-#	def getType(self):
-#		t = self._getAttr('type')
-#		if not t: t == 'leaf'
-#		return t
+#    def getType(self):
+#        t = self._getAttr('type')
+#        if not t: t == 'leaf'
+#        return t
 #
 #registerStanzaPlugin(Pubsub, Default)
 
 class Publish(Items):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'publish'
-	plugin_attrib = name
-	interfaces = set(('node',))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-	subitem = (Item,)
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'publish'
+    plugin_attrib = name
+    interfaces = set(('node',))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+    subitem = (Item,)
 
 registerStanzaPlugin(Pubsub, Publish)
 
 class Retract(Items):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'retract'
-	plugin_attrib = name
-	interfaces = set(('node', 'notify'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'retract'
+    plugin_attrib = name
+    interfaces = set(('node', 'notify'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
 registerStanzaPlugin(Pubsub, Retract)
 
 class Unsubscribe(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'unsubscribe'
-	plugin_attrib = name
-	interfaces = set(('node', 'jid', 'subid'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'unsubscribe'
+    plugin_attrib = name
+    interfaces = set(('node', 'jid', 'subid'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
-	def setJid(self, value):
-		self._setAttr('jid', str(value))
+    def setJid(self, value):
+        self._setAttr('jid', str(value))
 
-	def getJid(self):
-		return JID(self._getAttr('jid'))
+    def getJid(self):
+        return JID(self._getAttr('jid'))
 
 registerStanzaPlugin(Pubsub, Unsubscribe)
 
 class Subscribe(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'subscribe'
-	plugin_attrib = name
-	interfaces = set(('node', 'jid'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'subscribe'
+    plugin_attrib = name
+    interfaces = set(('node', 'jid'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
-	def setJid(self, value):
-		self._setAttr('jid', str(value))
+    def setJid(self, value):
+        self._setAttr('jid', str(value))
 
-	def getJid(self):
-		return JID(self._getAttr('jid'))
+    def getJid(self):
+        return JID(self._getAttr('jid'))
 
 registerStanzaPlugin(Pubsub, Subscribe)
 
 class Configure(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'configure'
-	plugin_attrib = name
-	interfaces = set(('node', 'type'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-
-	def getType(self):
-		t = self._getAttr('type')
-		if not t: t == 'leaf'
-		return t
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'configure'
+    plugin_attrib = name
+    interfaces = set(('node', 'type'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+
+    def getType(self):
+        t = self._getAttr('type')
+        if not t: t == 'leaf'
+        return t
 
 registerStanzaPlugin(Pubsub, Configure)
 registerStanzaPlugin(Configure, xep_0004.Form)
 
 class Options(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub'
-	name = 'options'
-	plugin_attrib = 'options'
-	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'))
+    namespace = 'http://jabber.org/protocol/pubsub'
+    name = 'options'
+    plugin_attrib = 'options'
+    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'))
 
 registerStanzaPlugin(Pubsub, Options)
 registerStanzaPlugin(Subscribe, Options)
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py
index a8ced8a9..201dc909 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py
@@ -9,147 +9,147 @@ 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'
-	name = 'pubsub'
-	plugin_attrib = 'pubsub_owner'
-	interfaces = set(tuple())
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    name = 'pubsub'
+    plugin_attrib = 'pubsub_owner'
+    interfaces = set(tuple())
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
 registerStanzaPlugin(Iq, PubsubOwner)
 
 class DefaultConfig(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	name = 'default'
-	plugin_attrib = 'default'
-	interfaces = set(('node', 'type', 'config'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    name = 'default'
+    plugin_attrib = 'default'
+    interfaces = set(('node', 'type', 'config'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
-	def __init__(self, *args, **kwargs):
-		ElementBase.__init__(self, *args, **kwargs)
+    def __init__(self, *args, **kwargs):
+        ElementBase.__init__(self, *args, **kwargs)
 
-	def getType(self):
-		t = self._getAttr('type')
-		if not t: t = 'leaf'
-		return t
+    def getType(self):
+        t = self._getAttr('type')
+        if not t: t = 'leaf'
+        return t
 
-	def getConfig(self):
-		return self['form']
+    def getConfig(self):
+        return self['form']
 
-	def setConfig(self, value):
-		self['form'].setStanzaValues(value.getStanzaValues())
-		return self
+    def setConfig(self, value):
+        self['form'].setStanzaValues(value.getStanzaValues())
+        return self
 
 registerStanzaPlugin(PubsubOwner, DefaultConfig)
 registerStanzaPlugin(DefaultConfig, xep_0004.Form)
 
 class OwnerAffiliations(Affiliations):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	interfaces = set(('node'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    interfaces = set(('node'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
-	def append(self, affiliation):
-		if not isinstance(affiliation, OwnerAffiliation):
-			raise TypeError
-		self.xml.append(affiliation.xml)
-		return self.affiliations.append(affiliation)
+    def append(self, affiliation):
+        if not isinstance(affiliation, OwnerAffiliation):
+            raise TypeError
+        self.xml.append(affiliation.xml)
+        return self.affiliations.append(affiliation)
 
 registerStanzaPlugin(PubsubOwner, OwnerAffiliations)
 
 class OwnerAffiliation(Affiliation):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	interfaces = set(('affiliation', 'jid'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    interfaces = set(('affiliation', 'jid'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
 class OwnerConfigure(Configure):
     name = 'configure'
     plugin_attrib = 'configure'
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	interfaces = set(('node', 'config'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-	
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    interfaces = set(('node', 'config'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+    
     def getConfig(self):
-		return self['form']
+        return self['form']
 
-	def setConfig(self, value):
-		self['form'].setStanzaValues(value.getStanzaValues())
-		return self
+    def setConfig(self, value):
+        self['form'].setStanzaValues(value.getStanzaValues())
+        return self
 
 registerStanzaPlugin(PubsubOwner, OwnerConfigure)
 
 class OwnerDefault(OwnerConfigure):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	interfaces = set(('node', 'config'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    interfaces = set(('node', 'config'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
 
 registerStanzaPlugin(PubsubOwner, OwnerDefault)
 registerStanzaPlugin(OwnerDefault, xep_0004.Form)
 
 class OwnerDelete(ElementBase, OptionalSetting):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	name = 'delete'
-	plugin_attrib = 'delete'
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-	interfaces = set(('node',))
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    name = 'delete'
+    plugin_attrib = 'delete'
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+    interfaces = set(('node',))
 
 registerStanzaPlugin(PubsubOwner, OwnerDelete)
 
 class OwnerPurge(ElementBase, OptionalSetting):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	name = 'purge'
-	plugin_attrib = name
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    name = 'purge'
+    plugin_attrib = name
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
 registerStanzaPlugin(PubsubOwner, OwnerPurge)
 
 class OwnerRedirect(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	name = 'redirect'
-	plugin_attrib = name
-	interfaces = set(('node', 'jid'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    name = 'redirect'
+    plugin_attrib = name
+    interfaces = set(('node', 'jid'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
-	def setJid(self, value):
-		self._setAttr('jid', str(value))
+    def setJid(self, value):
+        self._setAttr('jid', str(value))
 
-	def getJid(self):
-		return JID(self._getAttr('jid'))
+    def getJid(self):
+        return JID(self._getAttr('jid'))
 
 registerStanzaPlugin(OwnerDelete, OwnerRedirect)
 
 class OwnerSubscriptions(Subscriptions):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	interfaces = set(('node',))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    interfaces = set(('node',))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
 
-	def append(self, subscription):
-		if not isinstance(subscription, OwnerSubscription):
-			raise TypeError
-		self.xml.append(subscription.xml)
-		return self.subscriptions.append(subscription)
+    def append(self, subscription):
+        if not isinstance(subscription, OwnerSubscription):
+            raise TypeError
+        self.xml.append(subscription.xml)
+        return self.subscriptions.append(subscription)
 
 registerStanzaPlugin(PubsubOwner, OwnerSubscriptions)
 
 class OwnerSubscription(ElementBase):
-	namespace = 'http://jabber.org/protocol/pubsub#owner'
-	name = 'subscription'
-	plugin_attrib = name
-	interfaces = set(('jid', 'subscription'))
-	plugin_attrib_map = {}
-	plugin_tag_map = {}
-
-	def setJid(self, value):
-		self._setAttr('jid', str(value))
-
-	def getJid(self):
-		return JID(self._getAttr('from'))
+    namespace = 'http://jabber.org/protocol/pubsub#owner'
+    name = 'subscription'
+    plugin_attrib = name
+    interfaces = set(('jid', 'subscription'))
+    plugin_attrib_map = {}
+    plugin_tag_map = {}
+
+    def setJid(self, value):
+        self._setAttr('jid', str(value))
+
+    def getJid(self):
+        return JID(self._getAttr('from'))