Import the main module properly and fix some oddities in Twisted to prevent it from discarding some data

commands/delete.py

@@ -1,4 +1,4 @@
-from core.main import *
+import main
 
 class Delete:
     def __init__(self, register):
@@ -7,20 +7,20 @@ class Delete:
     def delete(self, addr, authed, data, obj, spl, success, failure, info, incUsage, length):
         if authed:
             if length == 2:
-                if not spl[1] in pool.keys():
+                if not spl[1] in main.pool.keys():
                     failure("Name does not exist: %s" % spl[1])
                     return
                 del pool[spl[1]]
-                if spl[1] in ReactorPool.keys():
-                    if spl[1] in FactoryPool.keys():
-                        FactoryPool[spl[1]].stopTrying()
-                    ReactorPool[spl[1]].disconnect()
-                    if spl[1] in IRCPool.keys():
-                        del IRCPool[spl[1]]
-                    del ReactorPool[spl[1]]
-                    del FactoryPool[spl[1]]
+                if spl[1] in main.ReactorPool.keys():
+                    if spl[1] in main.FactoryPool.keys():
+                        main.FactoryPool[spl[1]].stopTrying()
+                    main.ReactorPool[spl[1]].disconnect()
+                    if spl[1] in main.IRCPool.keys():
+                        del main.IRCPool[spl[1]]
+                    del main.ReactorPool[spl[1]]
+                    del main.FactoryPool[spl[1]]
                 success("Successfully removed bot")
-                saveConf("pool")
+                main.saveConf("pool")
                 return
             else:
                 incUsage("del")