handle twitter.TwitterError exceptions

diff --git a/commands.py b/commands.py
index 0f958e277ac8c47b7976446fdfe4234e1deb3093..1fce3fe0af2271b3fc4914fef2a23681599a1c77 100644 (file)
--- 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