Garmelon/yaboli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refer to password as "password", not "pw"

Browse source
This commit is contained in:
Joscha 2016-09-21 18:51:47 +00:00
parent b4eacde6ca
commit 65cad2cdf3
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
yaboli/botmanager.py
View file

@ -31,9 +31,9 @@ class BotManager:
self.bot_id_counter = 0 # no two bots can have the same id self.bot_id_counter = 0 # no two bots can have the same id
self.bots = {} # each bot has an unique id self.bots = {} # each bot has an unique id
def create(self, nick, roomname, pw=None, creator=None, create_room=None, create_time=None): def create(self, nick, roomname, password=None, creator=None, create_room=None, create_time=None):
""" """
create(nick, roomname, pw, creator, create_room, create_time) -> bot create(nick, roomname, password, creator, create_room, create_time) -> bot
Create a bot of type self.bot_class. Create a bot of type self.bot_class.
Starts the bot and returns it. Starts the bot and returns it.
@ -48,7 +48,7 @@ class BotManager:
if create_time is None: if create_time is None:
create_time = time.time() create_time = time.time()
bot = self.bot_class(nick, roomname, pw=pw, creator=creator, create_room=create_room, bot = self.bot_class(nick, roomname, password=password, creator=creator, create_room=create_room,
create_time=create_time, manager=self) create_time=create_time, manager=self)
self.bots[bot_id] = bot self.bots[bot_id] = bot
@ -128,7 +128,7 @@ class BotManager:
bots.append({ bots.append({
"nick": bot.get_nick(), "nick": bot.get_nick(),
"room": bot.get_roomname(), "room": bot.get_roomname(),
"pw": bot.get_roompw(), "password": bot.get_roompassword(),
"creator": bot.get_creator(), "creator": bot.get_creator(),
"create_room": bot.get_create_room(), "create_room": bot.get_create_room(),
"create_time": bot.get_create_time(), "create_time": bot.get_create_time(),
@ -164,7 +164,7 @@ class BotManager:
logger.debug("Bot info: {}".format(bots)) logger.debug("Bot info: {}".format(bots))
for bot_info in bots: for bot_info in bots:
try: try:
self.create(bot_info["nick"], bot_info["room"], bot_info["pw"], self.create(bot_info["nick"], bot_info["room"], bot_info["password"],
bot_info["creator"], bot_info["create_room"], bot_info["creator"], bot_info["create_room"],
bot_info["create_time"]).load(bot_info["data"]) bot_info["create_time"]).load(bot_info["data"])
except CreateBotException as err: except CreateBotException as err: