fixes

[wolnelektury.git] / src / api / views.py

diff --git a/src/api/views.py b/src/api/views.py
index 99c8df1..be1491b 100644 (file)
--- a/src/api/views.py
+++ b/src/api/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -11,13 +10,12 @@ from django.views.generic.base import View
 from oauthlib.common import urlencode
 from oauthlib.oauth1 import RequestTokenEndpoint, AccessTokenEndpoint
 from oauthlib.oauth1 import AuthorizationEndpoint, OAuth1Error
 from oauthlib.common import urlencode
 from oauthlib.oauth1 import RequestTokenEndpoint, AccessTokenEndpoint
 from oauthlib.oauth1 import AuthorizationEndpoint, OAuth1Error

-from api.models import KEY_SIZE, SECRET_SIZE

 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView

-from rest_framework.generics import ListAPIView, RetrieveAPIView, get_object_or_404
+from rest_framework.generics import RetrieveAPIView, get_object_or_404

 from catalogue.models import Book
 from catalogue.models import Book

-from .models import BookUserData
+from .models import BookUserData, KEY_SIZE, SECRET_SIZE

 from . import serializers
 from .request_validator import PistonRequestValidator
 from .utils import oauthlib_request, oauthlib_response, vary_on_auth
 from . import serializers
 from .request_validator import PistonRequestValidator
 from .utils import oauthlib_request, oauthlib_response, vary_on_auth


@@ -77,7 +75,7 @@ def oauth_user_auth(request):
             realms, credentials = endpoint.get_realms_and_credentials(
                 **oauthlib_request(request))
         except OAuth1Error as e:
             realms, credentials = endpoint.get_realms_and_credentials(
                 **oauthlib_request(request))
         except OAuth1Error as e:

-            return HttpResponse(e.message, status=400)
+            return HttpResponse(str(e), status=400)

         callback = request.GET.get('oauth_callback')
 
         form = OAuthAuthenticationForm(initial={
         callback = request.GET.get('oauth_callback')
 
         form = OAuthAuthenticationForm(initial={


@@ -87,7 +85,7 @@ def oauth_user_auth(request):
 
         return render(request, 'oauth/authorize_token.html', {'form': form})
 
 
         return render(request, 'oauth/authorize_token.html', {'form': form})
 

-    elif request.method == "POST":
+    if request.method == "POST":

         try:
             response = oauthlib_response(
                 endpoint.create_authorization_response(
         try:
             response = oauthlib_response(
                 endpoint.create_authorization_response(