Error checking on alias removal and clean up when removing relays

modules/network.py

@@ -38,14 +38,8 @@ class Network:
         #    self.start_bot(num)
         return num, main.alias[num]["nick"]
 
-    def delete_relay(self, id):
-        del self.relays[id]
-        del self.aliases[id]
-        #del main.alias[id] - Aliases are global per num, so don't delete them!
-
-    def seppuku(self):
-        # Removes all bots in preperation for deletion
-        for i in self.relays.keys():
+    def killAliases(self, aliasList):
+        for i in aliasList:
             name = self.net+str(i)
             if name in main.ReactorPool.keys():
                 if name in main.FactoryPool.keys():
@@ -56,6 +50,16 @@ class Network:
                 del main.ReactorPool[name]
                 del main.FactoryPool[name]
 
+    def delete_relay(self, id):
+        del self.relays[id]
+        del self.aliases[id]
+        #del main.alias[id] - Aliases are global per num, so don't delete them!
+        self.killAliases([id])
+
+    def seppuku(self):
+        # Removes all bots in preperation for deletion
+        self.killAliases(self.relay.keys())
+
     def start_bot(self, num):
         # a single name is given to relays in the backend
         # e.g. freenode1 for the first relay on freenode network