From: Matthew Vernon <matthewv@chiark.greenend.org.uk>
Date: Wed, 13 Apr 2011 10:27:27 +0000 (+0100)
Subject: send tweets as UTF-8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;ds=sidebyside;h=244cd25795f26cf35f7853c836f07ac1d52ff110;p=irc.git

send tweets as UTF-8

Author: Colin Watson <cjwatson@chiark.greenend.org.uk>
---

diff --git a/commands.py b/commands.py
index 7b93d88..6049640 100644
--- a/commands.py
+++ b/commands.py
@@ -401,19 +401,16 @@ def twitterq(bot,cmd,nick,conn,public,twitapi):
   urlstring = urlre.search(cmd).group(1)
   if (urlstring.find("twitter.com") !=-1):
     stringout = getTweet(urlstring,twitapi)
-    try:
-        bot.automsg(public, nick, stringout)
-    except UnicodeEncodeError:
-        bot.automsg(public, nick, "Sorry, that tweet contained non-ASCII characters")
+    bot.automsg(public, nick, stringout)
   
 def getTweet(urlstring,twitapi):
   parts = string.split(urlstring,'/')
   tweetID = parts[-1]
   try:
     status = twitapi.GetStatus(tweetID)
-    tweeter_screen = status.user.screen_name
-    tweeter_name = status.user.name
-    tweetText = status.text
+    tweeter_screen = status.user.screen_name.encode('UTF-8', 'replace')
+    tweeter_name = status.user.name.encode('UTF-8', 'replace')
+    tweetText = status.text.encode('UTF-8', 'replace')
     stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
   except twitter.TwitterError:
     terror = sys.exc_info()