From a1646ec596f9025f39c1fa4ecdcc6884330a6a60 Mon Sep 17 00:00:00 2001 From: Griatch Date: Fri, 18 Oct 2013 15:09:03 +0200 Subject: [PATCH] Fixed an issue with a CmdClock not being a part of the __all__ module handle (this causes ev.py to fail to import it) --- src/commands/cmdhandler.py | 10 +++++----- src/commands/default/comms.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/commands/cmdhandler.py b/src/commands/cmdhandler.py index 0a3e7bbde7..fe703d051f 100644 --- a/src/commands/cmdhandler.py +++ b/src/commands/cmdhandler.py @@ -224,11 +224,11 @@ def get_and_merge_cmdsets(caller, session, player, obj, callertype, sessid=None) # Main command-handler function @inlineCallbacks -def cmdhandler(called_on, raw_string, testing=False, callertype="session", sessid=None): +def cmdhandler(called_by, raw_string, testing=False, callertype="session", sessid=None): """ This is the main function to handle any string sent to the engine. - called_on - object on which this was called from. This is either a Session, a Player or an Object. + called_by - object on which this was called from. This is either a Session, a Player or an Object. raw_string - the command string given on the command line testing - if we should actually execute the command or not. if True, the command instance will be returned instead. @@ -246,16 +246,16 @@ def cmdhandler(called_on, raw_string, testing=False, callertype="session", sessi """ session, player, obj = None, None, None if callertype == "session": - session = called_on + session = called_by player = session.player if player: obj = yield _GA(player.dbobj, "get_puppet")(session.sessid) elif callertype == "player": - player = called_on + player = called_by if sessid: obj = yield _GA(player.dbobj, "get_puppet")(sessid) elif callertype == "object": - obj = called_on + obj = called_by else: raise RuntimeError("cmdhandler: callertype %s is not valid." % callertype) diff --git a/src/commands/default/comms.py b/src/commands/default/comms.py index b36d89e750..43f719c98b 100644 --- a/src/commands/default/comms.py +++ b/src/commands/default/comms.py @@ -18,7 +18,7 @@ from src.commands.default.muxcommand import MuxCommand, MuxPlayerCommand # limit symbol import for API __all__ = ("CmdAddCom", "CmdDelCom", "CmdAllCom", "CmdChannels", "CmdCdestroy", "CmdCBoot", "CmdCemit", - "CmdCWho", "CmdChannelCreate", "CmdCset", "CmdCdesc", + "CmdCWho", "CmdChannelCreate", "CmdClock", "CmdCdesc", "CmdPage", "CmdIRC2Chan", "CmdIMC2Chan", "CmdIMCInfo", "CmdIMCTell", "CmdRSS2Chan")