Merge branch 'testing' of github.com:ProgVal/Limnoria into mkaysi

This commit is contained in:
Mika Suomalainen 2011-12-18 13:41:28 +02:00
commit 49aac12f31

View File

@ -830,7 +830,8 @@ class NestedCommandsIrcProxy(ReplyIrcProxy):
# action=True implies noLengthCheck=True and prefixNick=False
self.noLengthCheck=noLengthCheck or self.noLengthCheck or self.action
target = self.private and self.to or self.msg.args[0]
s = str(s) # Allow non-string esses.
if not isinstance(s, basestring): # avoid trying to str() unicode
s = str(s) # Allow non-string esses.
if self.finalEvaled:
try:
if isinstance(self.irc, self.__class__):