Merge pull request #23 from cwood/dev

Better handling for not connecting or json decode error
coagulant · Feb 18, 2013 · 0a6ef2a · 0a6ef2a
2 parents 59ba3b2 + 7b0dfe3
commit 0a6ef2a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/twitter_tag/templatetags/twitter_tag.py b/twitter_tag/templatetags/twitter_tag.py
@@ -12,6 +12,7 @@
 
 from ..utils import expand_tweet_urls, urlize_twitter_text, get_user_cache_key, get_search_cache_key
 
+from urllib2 import URLError
 
 register = template.Library()
 
@@ -46,7 +47,7 @@ def render_tag(self, context, **kwargs):
                                          settings.TWITTER_CONSUMER_KEY,
                                          settings.TWITTER_CONSUMER_SECRET))
             json = self.get_json(twitter, **self.get_api_call_params(**kwargs))
-        except TwitterError as e:
+        except (TwitterError, URLError, ValueError) as e:
             logging.getLogger(__name__).error(str(e))
             context[kwargs['asvar']] = cache.get(cache_key, [])
             return ''