Import the main module properly and fix some oddities in Twisted to prevent it from discarding some data
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
from os import listdir
|
||||
from core.main import *
|
||||
from utils.logging.log import *
|
||||
import commands
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
from os import listdir
|
||||
from core.main import *
|
||||
import main
|
||||
from utils.logging.log import *
|
||||
import commands
|
||||
|
||||
def loadSingle(command, func):
|
||||
if command+".py" in listdir("commands"):
|
||||
try:
|
||||
if command in CommandMap.keys():
|
||||
if command in main.CommandMap.keys():
|
||||
return "Cannot reload modules"
|
||||
else:
|
||||
className = command.capitalize()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from core.main import connections, help
|
||||
import main
|
||||
|
||||
def sendData(addr, data):
|
||||
connections[addr].send(data)
|
||||
main.connections[addr].send(data)
|
||||
|
||||
def sendSuccess(addr, data):
|
||||
sendData(addr, "[y] " + data)
|
||||
@@ -13,14 +13,14 @@ def sendInfo(addr, data):
|
||||
sendData(addr, "[i] " + data)
|
||||
|
||||
def sendAll(data):
|
||||
for i in connections:
|
||||
connections[i].send(data)
|
||||
for i in main.connections:
|
||||
main.connections[i].send(data)
|
||||
return
|
||||
|
||||
def incorrectUsage(addr, mode):
|
||||
if mode == None:
|
||||
sendFailure(addr, "Incorrect usage")
|
||||
return
|
||||
if mode in help.keys():
|
||||
sendFailure(addr, "Usage: " + help[mode])
|
||||
if mode in main.help.keys():
|
||||
sendFailure(addr, "Usage: " + main.help[mode])
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user