librarian update

[redakcja.git] / apps / apiclient / __init__.py

diff --git a/apps/apiclient/__init__.py b/apps/apiclient/__init__.py
index 7913ac3..38ce26e 100644 (file)
--- a/apps/apiclient/__init__.py
+++ b/apps/apiclient/__init__.py
@@ -1,9 +1,8 @@
 import urllib
 
 import urllib
 

-from django.utils import simplejson
+import json

 import oauth2
 
 import oauth2
 

-from apiclient.models import OAuthConnection

 from apiclient.settings import WL_CONSUMER_KEY, WL_CONSUMER_SECRET, WL_API_URL
 
 
 from apiclient.settings import WL_CONSUMER_KEY, WL_CONSUMER_SECRET, WL_API_URL
 
 


@@ -22,25 +21,30 @@ class NotAuthorizedError(BaseException):
 
 
 def api_call(user, path, data=None):
 
 
 def api_call(user, path, data=None):

-    # what if not verified?
+    from .models import OAuthConnection

     conn = OAuthConnection.get(user)
     if not conn.access:
         raise NotAuthorizedError("No WL authorization for user %s." % user)
     token = oauth2.Token(conn.token, conn.token_secret)
     client = oauth2.Client(wl_consumer, token)
     if data is not None:
     conn = OAuthConnection.get(user)
     if not conn.access:
         raise NotAuthorizedError("No WL authorization for user %s." % user)
     token = oauth2.Token(conn.token, conn.token_secret)
     client = oauth2.Client(wl_consumer, token)
     if data is not None:

+        data = json.dumps(data)
+        data = urllib.urlencode({"data": data})

         resp, content = client.request(
         resp, content = client.request(

-                "%s%s.json" % (WL_API_URL, path),
+                "%s%s" % (WL_API_URL, path),

                 method="POST",
                 method="POST",

-                body=urllib.urlencode(data))
+                body=data)

     else:
         resp, content = client.request(
     else:
         resp, content = client.request(

-                "%s%s.json" % (WL_API_URL, path))
+                "%s%s" % (WL_API_URL, path))

     status = resp['status']
     status = resp['status']

+

     if status == '200':
     if status == '200':

-        return simplejson.loads(content)
+        return json.loads(content)

     elif status.startswith('2'):
         return
     elif status.startswith('2'):
         return

+    elif status == '401':
+        raise ApiError('User not authorized for publishing.')

     else:
     else:

-        raise ApiError("WL API call error")
+        raise ApiError("WL API call error %s, path: %s" % (status, path))