Merge branch 'master' into python3.5

2018-02-14 23:35:33 +02:00
parent 6d99258c99 089d372334
commit c29059d5d5
6 changed files with 114 additions and 58 deletions
@@ -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()