From e2f27512bcfc4e4dc0d75088d198a5cdef84c6d6 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@users.sourceforge.net>
Date: Tue, 6 Dec 2011 00:08:01 -0500
Subject: [PATCH] Only use ircmsg.whois's mask argument if it's non-empty.

Closes: Sf#3121298
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit f6f9e654cb5801baa05adfe141df640a29dc3c90)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
---
 src/ircmsgs.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ircmsgs.py b/src/ircmsgs.py
index 8db844c3f..d5f9fcaa1 100644
--- a/src/ircmsgs.py
+++ b/src/ircmsgs.py
@@ -727,7 +727,10 @@ def whois(nick, mask='', prefix='', msg=None):
         assert isNick(nick), repr(nick)
     if msg and not prefix:
         prefix = msg.prefix
-    return IrcMsg(prefix=prefix, command='WHOIS', args=(nick, mask), msg=msg)
+    args = (nick,)
+    if mask:
+        args = (nick, mask)
+    return IrcMsg(prefix=prefix, command='WHOIS', args=args, msg=msg)
 
 def names(channel=None, prefix='', msg=None):
     if conf.supybot.protocols.irc.strictRfc():