minor fix

[redakcja.git] / lib / wlapi / __init__.py

diff --git a/lib/wlapi/__init__.py b/lib/wlapi/__init__.py
index 3284211..8491be2 100644 (file)
--- a/lib/wlapi/__init__.py
+++ b/lib/wlapi/__init__.py
@@ -8,7 +8,7 @@
 """
 import urllib2
 import functools
 """
 import urllib2
 import functools

-import django.utils.simplejson as json
+import json

 import logging
 logger = logging.getLogger("fnp.lib.wlapi")
 
 import logging
 logger = logging.getLogger("fnp.lib.wlapi")
 


@@ -45,10 +45,11 @@ def api_call(path, format="json"):
 
             try:
                 anwser = json.load(self.opener.open(rq))
 
             try:
                 anwser = json.load(self.opener.open(rq))

-                return generator.send(anwser)
-            except StopIteration:
-                # by default, just return the anwser as a shorthand
-                return anwser
+                try:
+                    return generator.send(anwser)
+                except StopIteration:
+                    # by default, just return the anwser as a shorthand
+                    return anwser

             except urllib2.HTTPError, error:
                 return self._http_error(error)
             except Exception, error:
             except urllib2.HTTPError, error:
                 return self._http_error(error)
             except Exception, error: