From 6d3a73e62376bed535029339699c9bdabc0660b6 Mon Sep 17 00:00:00 2001
From: Matthew Vernon <matthewv@chiark.greenend.org.uk>
Date: Wed, 2 Mar 2011 14:56:40 +0000
Subject: [PATCH] handle twitter.TwitterError exceptions

---
 commands.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/commands.py b/commands.py
index 0f958e2..1fce3fe 100644
--- a/commands.py
+++ b/commands.py
@@ -406,9 +406,13 @@ def twitterq(bot,cmd,nick,conn,public,twitapi):
 def getTweet(urlstring,twitapi):
   parts = string.split(urlstring,'/')
   tweetID = parts[-1]
-  status = twitapi.GetStatus(tweetID)
-  tweeter_screen = status.user.screen_name
-  tweeter_name = status.user.name
-  tweetText = status.text
-  stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
+  try:
+    status = twitapi.GetStatus(tweetID)
+    tweeter_screen = status.user.screen_name
+    tweeter_name = status.user.name
+    tweetText = status.text
+    stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
+  except twitter.TwitterError:
+    terror = sys.exc_info()
+    stringout = "Twitter error: %s" % terror[1].__str__()
   return stringout
-- 
2.30.2