Merge lp:~roignac/gwibber/Bug352226-digg-internal-errors into lp:gwibber

[Vadim Rutkovsky]

A small fix for Digg - handle internal Digg errors correctly

[Ken VanDine (ken-vandine)]

Approved, thanks!

review: Approve

=== modified file 'gwibber/microblog/digg.py'
--- gwibber/microblog/digg.py	2010-04-11 22:15:31 +0000
+++ gwibber/microblog/digg.py	2010-09-27 20:48:41 +0000
@@ -65,10 +65,15 @@
   def _get(self, path, parse="story", post=False, single=False, **args):
     url = "/".join((URL_PREFIX, path)) + "?appkey=http://gwibber.com&type=json"
     
-    data = network.Download(url, util.compact(args) or None, post).get_json()["stories"]
-    if single: return [getattr(self, "_%s" % parse)(data)]
-    if parse: return [getattr(self, "_%s" % parse)(m) for m in data]
-    else: return []
+    data = network.Download(url, util.compact(args) or None, post).get_json()
+    if "stories" in data:
+        if single: return [getattr(self, "_%s" % parse)(data["stories"])]
+        if parse: return [getattr(self, "_%s" % parse)(m) for m in data["stories"]]
+        else: return []
+    else:
+        if ("status" in data) and ("message" in data):
+            print "Digg: got message with status %s and message %s" % (data["status"], data["message"])
+        return []
 
   def __call__(self, opname, **args):
     return getattr(self, opname)(**args)