From e0c08d3f98f9bd506b73da261f4ae9f7638e2cc4 Mon Sep 17 00:00:00 2001
From: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
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.

---
 src/callbacks.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/callbacks.py b/src/callbacks.py
index 45b34650c..11e41d2e9 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -824,7 +824,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__):