From 773d11f6cbaa8da91185547b0ab67f3706d735c2 Mon Sep 17 00:00:00 2001 From: jesopo Date: Tue, 16 Oct 2018 15:09:58 +0100 Subject: Change all instances of stdout.write+return to `raise utils.EventError` in modules --- modules/admin.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'modules/admin.py') diff --git a/modules/admin.py b/modules/admin.py index 77260711..7fa4c602 100644 --- a/modules/admin.py +++ b/modules/admin.py @@ -51,18 +51,16 @@ class Module(ModuleManager.BaseModule): """ id = event["args_split"][0] if not id.isdigit(): - event["stderr"].write("Please provide a numeric server ID") - return + raise utils.EventError("Please provide a numeric server ID") id = int(id) if not self.bot.database.servers.get(id): - event["stderr"].write("Unknown server ID") - return + raise utils.EventError("Unknown server ID") existing_server = self.bot.get_server(id) if existing_server: - event["stderr"].write("Already connected to %s" % str( + raise utils.EventError("Already connected to %s" % str( existing_server)) - return + server = self.bot.add_server(id) event["stdout"].write("Connecting to %s" % str(server)) -- cgit v1.3.1-10-gc9f91