From 6355ed2298a3962ba34732b4c7878da388f3bec6 Mon Sep 17 00:00:00 2001 From: Michael King Date: Sat, 28 Apr 2007 14:53:13 +0000 Subject: [PATCH] * Found all my stupid bugs, and remembered that django's Model#get() will raise an exception if it cannot find any matching objects. Used that to determine "no such user". --- commands_general.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/commands_general.py b/commands_general.py index c7bdb25287..bab2fb5f47 100644 --- a/commands_general.py +++ b/commands_general.py @@ -247,19 +247,14 @@ def cmd_page(cdat): cdat['uinput']['splitted'].pop(0) target_name = cdat['uinput']['splitted'].pop(0) message = ' '.join(cdat['uinput']['splitted']) - target = Object.objects.get(name__iexact=target_name) - if target: - session.msg("Found user %s.", (target.get_name(),)) - try: - if target.is_connected_plr(): - target.emit_to("% pages you with: %s" % - (session.get_pobject().name.capitalize(), message)) - session.msg("Page sent.") - else: - session.msg("User %s is not logged on." % (target_name.capitalize(),)) - except: - pass - else: + try: + target = Object.objects.get(name__iexact=target_name) + if target.is_connected_plr(): + target.emit_to("%s pages you with: %s" % (session.get_pobject().get_name(), message)) + session.msg("Page sent.") + else: + session.msg("User %s is not logged on." % (target_name.capitalize(),)) + except: session.msg("User %s not found." % (target_name,)) def cmd_quit(cdat):