Merge branch 'master' into python3.5

This commit is contained in:
Tulir Asokan
2018-02-14 23:35:33 +02:00
6 changed files with 114 additions and 58 deletions
+1 -1
View File
@@ -104,7 +104,7 @@ class CommandHandler:
evt.command = ""
command = sender.command_status["next"]
else:
command = command_handlers["unknown_command"]
command = command_handlers["unknown-command"]
try:
await command(evt)
except FloodWaitError as e:
+1 -1
View File
@@ -102,7 +102,7 @@ async def delete_portal(evt):
that_this = "This" if room_id == evt.room_id else "That"
return await evt.reply(f"{that_this} is not a portal room.")
async def post_confirm(_, confirm):
async def post_confirm(confirm):
evt.sender.command_status = None
if len(confirm.args) > 0 and confirm.args[0] == "confirm-delete":
await portal.cleanup_and_delete()