fml: Proper error message when server is unavailable

[irc/rizon/acid.git] / pyva / pyva / src / main / python / internets / api / quotes.py

diff --git a/pyva/pyva/src/main/python/internets/api/quotes.py b/pyva/pyva/src/main/python/internets/api/quotes.py
index c9540aa24bdb5eb836f08dc2785a70c68eb9de38..7bf35eb2cf75b65848684f9dc9b4fab583780a5d 100644 (file)
--- a/pyva/pyva/src/main/python/internets/api/quotes.py
+++ b/pyva/pyva/src/main/python/internets/api/quotes.py
@@ -51,8 +51,11 @@ class Quotes(object):
                if quote_id is None:  # if we're doing a random quote
                        # for random quotes, we request 10 at a time, then repopulate our cache when it runs out
                        if not self.fml_cache:
-                               self.fml_cache = self._get_fml_quotes('http://api.fmylife.com/view/random/10/nocomment?key=%s&language=en' % self.key_fml)
-
+                               try:
+                                       self.fml_cache = self._get_fml_quotes('http://api.fmylife.com/view/random/10/nocomment?key=%s&language=en' % self.key_fml)                                      
+                               except Exception as e:
+                                       raise FmlException("fmylife.com is temporarily unavailable. Please try again later.")
+                               
                                if len(self.fml_cache) == 0:
                                        raise FmlException("fmylife.com is temporarily unavailable. Please try again later.")