From 5bb6fdcd5202fcdeb9d4f6f1f865ff21160f1f9e Mon Sep 17 00:00:00 2001 From: Daniel Folkinshteyn Date: Tue, 13 Dec 2011 18:21:38 -0500 Subject: [PATCH] core: avoid casting data to string if it is already an instance of basestring, in irc.reply. Signed-off-by: James McCoy --- src/callbacks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/callbacks.py b/src/callbacks.py index 49222b5f7..f8ec9eab9 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -826,7 +826,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__):