From fbbd26ed877d49dc10cef6d98ecf660c3f115cc6 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Jun 27 2008 04:52:30 +0000
Subject: Merge branch 'master' of ssh://git.fedorahosted.org/git/supybot-fedora


Conflicts:

	plugin.py

---

diff --git a/plugin.py b/plugin.py
index 1511f58..fa6d9a7 100644
--- a/plugin.py
+++ b/plugin.py
@@ -44,6 +44,7 @@ from fedora.accounts.fas2 import AccountSystem
 import simplejson
 import urllib
 import commands
+from urllib2 import URLError
 
 
 class Title(sgmllib.SGMLParser):
@@ -145,9 +146,14 @@ class Fedora(callbacks.Plugin):
         if not self.userlist or (time.time() - self.userlist_timestamp) >= \
            self.userlist_cache:
             irc.reply("Just a moment, I need to rebuild the user cache...")
-            self.userlist = self.fasclient.people_by_id()
+            try:
+                self.userlist = self.fasclient.people_by_id()
+            except URLError:
+                irc.reply("There was an error getting user data. Please try "+\
+                          "again.")
             #import cPickle
             #self.userlist = cPickle.load(open('/tmp/ricbot.data'))
+            #cPickle.dump(self.userlist, open('/tmp/ricbot.data', 'w'))
             self.userlist_timestamp = time.time()
         mystr = []
         for user in self.userlist: