PEP8 cleanup and small text fixes

Author: maxim-kht

demo/templates/base.html

@@ -7,7 +7,7 @@
     <meta name="description" content="Django-rest-auth demo">
     <meta name="author" content="Tivix, Inc.">
 
-    <title>Starter Template for Bootstrap</title>
+    <title>django-rest-auth demo</title>
 
     <!-- Latest compiled and minified CSS -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">

flake8

@@ -1,4 +1,4 @@
 [flake8]
-max-line-length = 160
+max-line-length = 120
 exclude = docs/*,demo/*
 ignore = F403

rest_auth/registration/serializers.py

@@ -9,7 +9,7 @@
     from allauth.account.adapter import get_adapter
     from allauth.account.utils import setup_user_email
 except ImportError:
-    raise ImportError('allauth needs to be added to INSTALLED_APPS.')
+    raise ImportError("allauth needs to be added to INSTALLED_APPS.")
 
 from rest_framework import serializers
 from requests.exceptions import HTTPError
@@ -31,12 +31,13 @@ def _get_request(self):
 
     def get_social_login(self, adapter, app, token, response):
         """
-
-        :param adapter: allauth.socialaccount Adapter subclass. Usually OAuthAdapter or Auth2Adapter
+        :param adapter: allauth.socialaccount Adapter subclass.
+            Usually OAuthAdapter or Auth2Adapter
         :param app: `allauth.socialaccount.SocialApp` instance
         :param token: `allauth.socialaccount.SocialToken` instance
         :param response: Provider's response for OAuth1. Not used in the
-        :returns: A populated instance of the `allauth.socialaccount.SocialLoginView` instance
+        :returns: A populated instance of the
+            `allauth.socialaccount.SocialLoginView` instance
         """
         request = self._get_request()
         social_login = adapter.complete_login(request, app, token, response=response)
@@ -49,12 +50,12 @@ def validate(self, attrs):
 
         if not view:
             raise serializers.ValidationError(
-                _('View is not defined, pass it as a context variable')
+                _("View is not defined, pass it as a context variable")
             )
 
         adapter_class = getattr(view, 'adapter_class', None)
         if not adapter_class:
-            raise serializers.ValidationError(_('Define adapter_class in view'))
+            raise serializers.ValidationError(_("Define adapter_class in view"))
 
         adapter = adapter_class(request)
         app = adapter.get_provider().get_app(request)
@@ -73,11 +74,11 @@ def validate(self, attrs):
 
             if not self.callback_url:
                 raise serializers.ValidationError(
-                    _('Define callback_url in view')
+                    _("Define callback_url in view")
                 )
             if not self.client_class:
                 raise serializers.ValidationError(
-                    _('Define client_class in view')
+                    _("Define client_class in view")
                 )
 
             code = attrs.get('code')
@@ -97,7 +98,8 @@ def validate(self, attrs):
             access_token = token['access_token']
 
         else:
-            raise serializers.ValidationError(_('Incorrect input. access_token or code is required.'))
+            raise serializers.ValidationError(
+                _("Incorrect input. access_token or code is required."))
 
         social_token = adapter.parse_token({'access_token': access_token})
         social_token.app = app

rest_auth/registration/views.py

@@ -32,7 +32,7 @@ class RegisterView(CreateAPIView):
     def get_response_data(self, user):
         if allauth_settings.EMAIL_VERIFICATION == \
                 allauth_settings.EmailVerificationMethod.MANDATORY:
-            return {"detail": _("Verification e-mail sent")}
+            return {"detail": _("Verification e-mail sent.")}
 
         if getattr(settings, 'REST_USE_JWT', False):
             data = {
@@ -49,7 +49,9 @@ def create(self, request, *args, **kwargs):
         user = self.perform_create(serializer)
         headers = self.get_success_headers(serializer.data)
 
-        return Response(self.get_response_data(user), status=status.HTTP_201_CREATED, headers=headers)
+        return Response(self.get_response_data(user),
+                        status=status.HTTP_201_CREATED,
+                        headers=headers)
 
     def perform_create(self, serializer):
         user = serializer.save(self.request)
@@ -65,7 +67,6 @@ def perform_create(self, serializer):
 
 
 class VerifyEmailView(APIView, ConfirmEmailView):
-
     permission_classes = (AllowAny,)
     allowed_methods = ('POST', 'OPTIONS', 'HEAD')
 

rest_auth/serializers.py

@@ -121,7 +121,6 @@ class Meta:
 
 
 class UserDetailsSerializer(serializers.ModelSerializer):
-
     """
     User model w/o password
     """
@@ -148,18 +147,15 @@ class JWTSerializer(serializers.Serializer):
 
 
 class PasswordResetSerializer(serializers.Serializer):
-
     """
     Serializer for requesting a password reset e-mail.
     """
-
     email = serializers.EmailField()
 
     password_reset_form_class = PasswordResetForm
 
     def get_email_options(self):
-        """ Override this method to change default e-mail options
-        """
+        """Override this method to change default e-mail options"""
         return {}
 
     def validate_email(self, value):
@@ -187,7 +183,6 @@ class PasswordResetConfirmSerializer(serializers.Serializer):
     """
     Serializer for requesting a password reset e-mail.
     """
-
     new_password1 = serializers.CharField(max_length=128)
     new_password2 = serializers.CharField(max_length=128)
     uid = serializers.CharField()
@@ -225,7 +220,6 @@ def save(self):
 
 
 class PasswordChangeSerializer(serializers.Serializer):
-
     old_password = serializers.CharField(max_length=128)
     new_password1 = serializers.CharField(max_length=128)
     new_password2 = serializers.CharField(max_length=128)

rest_auth/social_serializers.py

@@ -21,15 +21,17 @@ def _get_request(self):
 
     def get_social_login(self, adapter, app, token, response):
         """
-
-        :param adapter: allauth.socialaccount Adapter subclass. Usually OAuthAdapter or Auth2Adapter
+        :param adapter: allauth.socialaccount Adapter subclass.
+            Usually OAuthAdapter or Auth2Adapter
         :param app: `allauth.socialaccount.SocialApp` instance
         :param token: `allauth.socialaccount.SocialToken` instance
         :param response: Provider's response for OAuth1. Not used in the
-        :returns: A populated instance of the `allauth.socialaccount.SocialLoginView` instance
+        :returns: A populated instance of the
+            `allauth.socialaccount.SocialLoginView` instance
         """
         request = self._get_request()
-        social_login = adapter.complete_login(request, app, token, response=response)
+        social_login = adapter.complete_login(request, app, token,
+                                              response=response)
         social_login.token = token
         return social_login
 
@@ -39,12 +41,12 @@ def validate(self, attrs):
 
         if not view:
             raise serializers.ValidationError(
-                'View is not defined, pass it as a context variable'
+                "View is not defined, pass it as a context variable"
             )
 
         adapter_class = getattr(view, 'adapter_class', None)
         if not adapter_class:
-            raise serializers.ValidationError('Define adapter_class in view')
+            raise serializers.ValidationError("Define adapter_class in view")
 
         adapter = adapter_class(request)
         app = adapter.get_provider().get_app(request)

rest_auth/views.py

@@ -23,7 +23,6 @@
 
 
 class LoginView(GenericAPIView):
-
     """
     Check the credentials and return the REST Token
     if the credentials are valid and authenticated.
@@ -53,7 +52,8 @@ def login(self):
         if getattr(settings, 'REST_USE_JWT', False):
             self.token = jwt_encode(self.user)
         else:
-            self.token = create_token(self.token_model, self.user, self.serializer)
+            self.token = create_token(self.token_model, self.user,
+                                      self.serializer)
 
         if getattr(settings, 'REST_SESSION_LOGIN', True):
             self.process_login()
@@ -66,9 +66,11 @@ def get_response(self):
                 'user': self.user,
                 'token': self.token
             }
-            serializer = serializer_class(instance=data, context={'request': self.request})
+            serializer = serializer_class(instance=data,
+                                          context={'request': self.request})
         else:
-            serializer = serializer_class(instance=self.token, context={'request': self.request})
+            serializer = serializer_class(instance=self.token,
+                                          context={'request': self.request})
 
         return Response(serializer.data, status=status.HTTP_200_OK)
 
@@ -82,7 +84,6 @@ def post(self, request, *args, **kwargs):
 
 
 class LogoutView(APIView):
-
     """
     Calls Django logout method and delete the Token object
     assigned to the current User object.
@@ -141,14 +142,12 @@ def get_queryset(self):
 
 
 class PasswordResetView(GenericAPIView):
-
     """
     Calls Django Auth PasswordResetForm save method.
 
     Accepts the following POST parameters: email
     Returns the success/fail message.
     """
-
     serializer_class = PasswordResetSerializer
     permission_classes = (AllowAny,)
 
@@ -174,15 +173,16 @@ class PasswordResetConfirmView(GenericAPIView):
         new_password1, new_password2
     Returns the success/fail message.
     """
-
     serializer_class = PasswordResetConfirmSerializer
     permission_classes = (AllowAny,)
 
     def post(self, request):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         serializer.save()
-        return Response({"detail": _("Password has been reset with the new password.")})
+        return Response(
+            {"detail": _("Password has been reset with the new password.")}
+        )
 
 
 class PasswordChangeView(GenericAPIView):
@@ -192,7 +192,6 @@ class PasswordChangeView(GenericAPIView):
     Accepts the following POST parameters: new_password1, new_password2
     Returns the success/fail message.
     """
-
     serializer_class = PasswordChangeSerializer
     permission_classes = (IsAuthenticated,)