From 28d81d656d87baa46c7b074cfee0c1b525b23487 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Tue, 26 Aug 2003 12:44:49 +0000
Subject: [PATCH] Made it handle improper arguments correctly; I never noticed
 that it wasn't doing it already.

---
 src/callbacks.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/callbacks.py b/src/callbacks.py
index 436715db5..5131634f9 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -300,9 +300,10 @@ class IrcObjectProxy:
                     self.reply(self.msg, '[%s]' % ' '.join(self.args))
         except ArgumentError:
             if hasattr(command, '__doc__'):
-                self.reply(self.msg, command.__doc__.splitlines()[0])
+                s = '%s %s' % (name, command.__doc__.splitlines()[0])
             else:
-                self.reply(self.msg, 'Invalid arguments.')
+                s = 'Invalid arguments for %s.' % name
+            self.reply(self.msg, s)
         except (SyntaxError, Error), e:
             self.reply(self.msg, debug.exnToString(e))
         except Exception, e:
@@ -365,7 +366,12 @@ class CommandThread(threading.Thread):
             debug.msg('%s took %s seconds.' % \
                       (self.commandName, elapsed), 'verbose')
         except ArgumentError:
-            self.irc.reply(self.msg, self.command.__doc__.splitlines()[0])
+            if hasattr(self.command, '__doc__'):
+                help = self.command.__doc__.splitlines()[0]
+                s = '%s %s' % (self.commandName, help)
+            else:
+                s = 'Invalid arguments for %s.' % self.commandName
+            self.irc.reply(self.msg, s)
         except (SyntaxError, Error), e:
             self.irc.reply(self.msg, debug.exnToString(e))
         except Exception, e: