1 files changed, 77 insertions, 62 deletions

diff --git a/autoexec.py b/autoexec.py
index 8a8b7e7..7953267 100644
--- a/autoexec.py
+++ b/autoexec.py
@@ -1,68 +1,83 @@
 #!/usr/bin/python
 import re
 
+
 class Autoexec(object):
-	def __init__(self):
-		self.networks={}
-	def onModuleAdd(self, IRC, label, onconnect=None, onregister=None, autojoin=None, usermodes=None, wallet=None, opername=None, opermodes=None, snomasks=None, operexec=None, operjoin=None):
-		labels=[v[0] for v in self.networks.values()]
-		if label in labels:
-			raise BaseException, "Label already exists"
-		if IRC in self.networks.keys():
-			raise BaseException, "Network already exists"
-		self.networks[IRC]=(label, onconnect, onregister, autojoin, usermodes, wallet, opername, opermodes, snomasks, operexec, operjoin)
-	def onModuleRem(self, IRC):
-		del self.networks[IRC]
-	def onConnect(self, IRC):
-		(label, onconnect, onregister, autojoin, usermodes, wallet, opername, opermodes, snomasks, operexec, operjoin)=self.networks[IRC]
-		if onconnect:
-			for line in onconnect:
-				IRC.raw(line, origin=self)
-	def onRegistered(self, IRC):
-		(label, onconnect, onregister, autojoin, usermodes, wallet, opername, opermodes, snomasks, operexec, operjoin)=self.networks[IRC]
-		if onregister:
-			for line in onregister:
-				IRC.raw(line, origin=self)
-		if usermodes:
-			IRC.raw("MODE %s %s"%(IRC.identity.nick, usermodes), origin=self)
-		if opername and wallet and "%s/opers/%s"%(label, opername) in wallet.keys():
-			IRC.raw("OPER %s %s"%(opername, wallet["%s/opers/%s"%(label, opername)]), origin=self)
-		if autojoin:
-			IRC.raw("JOIN %s"%(",".join(autojoin)), origin=self)
-	def onRecv(self, IRC, line, data):
-		if data==None:
-			return
-		(label, onconnect, onregister, autojoin, usermodes, wallet, opername, opermodes, snomasks, operexec, operjoin)=self.networks[IRC]
-		(origin, ident, host, cmd, target, params, extinfo)=data
-		if cmd=="381" and opermodes:
-			if operexec:
-				for line in operexec:
-					IRC.raw(line, origin=self)
-			if opermodes:
-				IRC.raw("MODE %s %s"%(IRC.identity.nick, opermodes), origin=self)
-			if snomasks:
-				IRC.raw("MODE %s +s %s"%(IRC.identity.nick, snomasks), origin=self)
-			if operjoin:
-				IRC.raw("JOIN %s"%(",".join(operjoin)), origin=self)
+    def __init__(self):
+        self.networks = {}
+
+    def onModuleAdd(self, IRC, label, onconnect=None, onregister=None, autojoin=None, usermodes=None, wallet=None, opername=None, opermodes=None, snomasks=None, operexec=None, operjoin=None):
+        labels = [v[0] for v in self.networks.values()]
+        if label in labels:
+            raise BaseException("Label already exists")
+        if IRC in self.networks.keys():
+            raise BaseException("Network already exists")
+        self.networks[IRC] = (label, onconnect, onregister, autojoin, usermodes, wallet, opername, opermodes, snomasks, operexec, operjoin)
+
+    def onModuleRem(self, IRC):
+        del self.networks[IRC]
+
+    def onConnect(self, IRC):
+        (label, onconnect, onregister, autojoin, usermodes, wallet, opername, opermodes, snomasks, operexec, operjoin) = self.networks[IRC]
+        if onconnect:
+            for line in onconnect:
+                IRC.raw(line, origin=self)
+
+    def onRegistered(self, IRC):
+        (label, onconnect, onregister, autojoin, usermodes, wallet, opername, opermodes, snomasks, operexec, operjoin) = self.networks[IRC]
+        if onregister:
+            for line in onregister:
+                IRC.raw(line, origin=self)
+        if usermodes:
+            IRC.raw("MODE %s %s"%(IRC.identity.nick, usermodes), origin=self)
+        if opername and wallet and "%s/opers/%s"%(label, opername) in wallet.keys():
+            IRC.raw("OPER %s %s"%(opername, wallet[
+                "%s/opers/%s"%(label, opername)]), origin=self)
+        if autojoin:
+            IRC.raw("JOIN %s"%(",".join(autojoin)), origin=self)
+
+    def onRecv(self, IRC, line, data):
+        if data is None:
+            return
+        (label, onconnect, onregister, autojoin, usermodes, wallet, opername, opermodes, snomasks, operexec, operjoin) = self.networks[IRC]
+        (origin, ident, host, cmd, target, params, extinfo) = data
+        if cmd == "381" and opermodes:
+            if operexec:
+                for line in operexec:
+                    IRC.raw(line, origin=self)
+            if opermodes:
+                IRC.raw("MODE %s %s"%(IRC.identity.nick,
+                                      opermodes), origin=self)
+            if snomasks:
+                IRC.raw("MODE %s +s %s"%(
+                    IRC.identity.nick, snomasks), origin=self)
+            if operjoin:
+                IRC.raw("JOIN %s"%(",".join(operjoin)), origin=self)
+
 
 class NickServ(object):
-	def __init__(self):
-		self.networks={}
-	def onModuleAdd(self, IRC, label, wallet=None, autojoin=None):
-		labels=[v[0] for v in self.networks.values()]
-		#print labels
-		if label in labels:
-			raise BaseException, "Label already exists"
-		if IRC in self.networks.keys():
-			raise BaseException, "Network already exists"
-		self.networks[IRC]=(label, wallet, autojoin)
-	def onModuleRem(self, IRC):
-		del self.networks[IRC]
-	def onRecv(self, IRC, line, data):
-		if data==None: return
-		(origin, ident, host, cmd, target, params, extinfo)=data
-		label, wallet, autojoin=self.networks[IRC]
-		if target==IRC.identity.nick and origin=="NickServ" and re.match("This nickname is registered and protected.", extinfo) and wallet and "%s/NickServ/%s"%(label, target.lower()) in wallet.keys():
-			IRC.user("NickServ").msg("identify %s" % wallet["%s/NickServ/%s"%(label, target.lower())])
-		if cmd=="900" and autojoin:
-			IRC.raw("JOIN %s"%(",".join(autojoin)), origin=self)
+    def __init__(self):
+        self.networks = {}
+
+    def onModuleAdd(self, IRC, label, wallet=None, autojoin=None):
+        labels = [v[0] for v in self.networks.values()]
+        #print labels
+        if label in labels:
+            raise BaseException("Label already exists")
+        if IRC in self.networks.keys():
+            raise BaseException("Network already exists")
+        self.networks[IRC] = (label, wallet, autojoin)
+
+    def onModuleRem(self, IRC):
+        del self.networks[IRC]
+
+    def onRecv(self, IRC, line, data):
+        if data is None:
+            return
+        (origin, ident, host, cmd, target, params, extinfo) = data
+        label, wallet, autojoin = self.networks[IRC]
+        if target == IRC.identity.nick and origin == "NickServ" and re.match("This nickname is registered and protected.", extinfo) and wallet and "%s/NickServ/%s"%(label, target.lower()) in wallet.keys():
+            IRC.user("NickServ").msg("identify %s" % wallet[
+                "%s/NickServ/%s"%(label, target.lower())])
+        if cmd == "900" and autojoin:
+            IRC.raw("JOIN %s"%(",".join(autojoin)), origin=self)