X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ccac52151427892364cf39322e7f8a0e18131ff5..ab47432c3b01145efcad2c2de1c945e9a3a1822b:/apps/apiclient/__init__.py diff --git a/apps/apiclient/__init__.py b/apps/apiclient/__init__.py index 376b66e6..38ce26e4 100644 --- a/apps/apiclient/__init__.py +++ b/apps/apiclient/__init__.py @@ -1,9 +1,8 @@ import urllib -from django.utils import simplejson +import json import oauth2 -from apiclient.models import OAuthConnection from apiclient.settings import WL_CONSUMER_KEY, WL_CONSUMER_SECRET, WL_API_URL @@ -22,13 +21,14 @@ class NotAuthorizedError(BaseException): def api_call(user, path, data=None): + 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: - data = simplejson.dumps(data) + data = json.dumps(data) data = urllib.urlencode({"data": data}) resp, content = client.request( "%s%s" % (WL_API_URL, path), @@ -40,11 +40,11 @@ def api_call(user, path, data=None): status = resp['status'] if status == '200': - return simplejson.loads(content) + return json.loads(content) elif status.startswith('2'): return elif status == '401': raise ApiError('User not authorized for publishing.') else: - raise ApiError("WL API call error [code %s]" % status) + raise ApiError("WL API call error %s, path: %s" % (status, path))