Misc. style fixes

Author: jleclanche

.travis.yml

@@ -21,8 +21,7 @@ matrix:
     - env: TOXENV=py36-djangomaster
 
 install:
-  - pip install tox "virtualenv<14"
-  - pip install coveralls
+  - pip install coveralls tox "virtualenv<14"
 
 script:
   - tox

README.rst

@@ -98,14 +98,14 @@ Changelog
 ---------
 
 0.12.0 [Unreleased]
-~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~
 
 * **Dropped support for Python 3.2 and Python 3.3**, added support for Python 3.6
 * Support for the `scopes` query parameter, deprecated in 0.6.1, has been dropped
 * #448: Added support for customizing applications' allowed grant types
 
 0.11.0 [2016-12-1]
-~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~
 
 * #315: AuthorizationView does not overwrite requests on get
 * #425: Added support for Django 1.10

oauth2_provider/decorators.py

@@ -11,8 +11,8 @@
 
 def protected_resource(scopes=None, validator_cls=OAuth2Validator, server_cls=Server):
     """
-    Decorator to protect views by providing OAuth2 authentication out of the box, optionally with
-    scope handling.
+    Decorator to protect views by providing OAuth2 authentication out of the box,
+    optionally with scope handling.
 
         @protected_resource()
         def my_view(request):
@@ -38,8 +38,8 @@ def _validate(request, *args, **kwargs):
 
 def rw_protected_resource(scopes=None, validator_cls=OAuth2Validator, server_cls=Server):
     """
-    Decorator to protect views by providing OAuth2 authentication and read/write scopes out of the
-    box.
+    Decorator to protect views by providing OAuth2 authentication and read/write scopes
+    out of the box.
     GET, HEAD, OPTIONS http methods require "read" scope. Otherwise "write" scope is required.
 
         @rw_protected_resource()

oauth2_provider/ext/rest_framework/permissions.py

@@ -93,8 +93,8 @@ class IsAuthenticatedOrTokenHasScope(BasePermission):
     This only returns True if the user is authenticated, but not using a token
     or using a token, and the token has the correct scope.
 
-    This is usefull when combined with the DjangoModelPermissions to allow people browse the browsable api's
-    if they log in using the a non token bassed middleware,
+    This is usefull when combined with the DjangoModelPermissions to allow people browse
+    the browsable api's if they log in using the a non token bassed middleware,
     and let them access the api's using a rest client with a token
     """
     def has_permission(self, request, view):

oauth2_provider/generators.py

@@ -18,16 +18,17 @@ def hash(self):
 class ClientIdGenerator(BaseHashGenerator):
     def hash(self):
         """
-        Generate a client_id without colon char as in http://tools.ietf.org/html/rfc2617#section-2
-        for Basic Authentication scheme
+        Generate a client_id for Basic Authentication scheme without colon char
+        as in http://tools.ietf.org/html/rfc2617#section-2
         """
         return oauthlib_generate_client_id(length=40, chars=UNICODE_ASCII_CHARACTER_SET)
 
 
 class ClientSecretGenerator(BaseHashGenerator):
     def hash(self):
-        return oauthlib_generate_client_id(length=oauth2_settings.CLIENT_SECRET_GENERATOR_LENGTH,
-                                           chars=UNICODE_ASCII_CHARACTER_SET)
+        length = oauth2_settings.CLIENT_SECRET_GENERATOR_LENGTH
+        chars = UNICODE_ASCII_CHARACTER_SET
+        return oauthlib_generate_client_id(length=length, chars=chars)
 
 
 def generate_client_id():

oauth2_provider/oauth2_backends.py

@@ -22,8 +22,8 @@ def __init__(self, server=None):
 
     def _get_escaped_full_path(self, request):
         """
-        Django considers "safe" some characters that aren't so for oauthlib. We have to search for
-        them and properly escape.
+        Django considers "safe" some characters that aren't so for oauthlib.
+        We have to search for them and properly escape.
         """
         parsed = list(urlparse(request.get_full_path()))
         unsafe = set(c for c in parsed[4]).difference(urlencoded)
@@ -45,8 +45,9 @@ def _get_extra_credentials(self, request):
 
     def _extract_params(self, request):
         """
-        Extract parameters from the Django request object. Such parameters will then be passed to
-        OAuthLib to build its own Request object. The body should be encoded using OAuthLib urlencoded
+        Extract parameters from the Django request object.
+        Such parameters will then be passed to OAuthLib to build its own
+        Request object. The body should be encoded using OAuthLib urlencoded.
         """
         uri = self._get_escaped_full_path(request)
         http_method = request.method
@@ -170,7 +171,7 @@ def verify_request(self, request, scopes):
 
 class JSONOAuthLibCore(OAuthLibCore):
     """
-    Extends the default OAuthLibCore to parse correctly requests with application/json Content-Type
+    Extends the default OAuthLibCore to parse correctly application/json requests
     """
     def extract_body(self, request):
         """

oauth2_provider/oauth2_validators.py

@@ -17,6 +17,7 @@
 from .models import Grant, AccessToken, RefreshToken, get_application_model, AbstractApplication
 from .settings import oauth2_settings
 
+
 log = logging.getLogger('oauth2_provider')
 
 GRANT_TYPE_MAPPING = {
@@ -31,7 +32,8 @@
 class OAuth2Validator(RequestValidator):
     def _extract_basic_auth(self, request):
         """
-        Return authentication string if request contains basic auth credentials, else return None
+        Return authentication string if request contains basic auth credentials,
+        otherwise return None
         """
         auth = request.headers.get('HTTP_AUTHORIZATION', None)
         if not auth:
@@ -93,11 +95,12 @@ def _authenticate_basic_auth(self, request):
 
     def _authenticate_request_body(self, request):
         """
-        Try to authenticate the client using client_id and client_secret parameters
-        included in body.
+        Try to authenticate the client using client_id and client_secret
+        parameters included in body.
 
-        Remember that this method is NOT RECOMMENDED and SHOULD be limited to clients unable to
-        directly utilize the HTTP Basic authentication scheme. See rfc:`2.3.1` for more details.
+        Remember that this method is NOT RECOMMENDED and SHOULD be limited to
+        clients unable to directly utilize the HTTP Basic authentication scheme.
+        See rfc:`2.3.1` for more details.
         """
         # TODO: check if oauthlib has already unquoted client_id and client_secret
         try:
@@ -117,8 +120,8 @@ def _authenticate_request_body(self, request):
 
     def _load_application(self, client_id, request):
         """
-        If request.client was not set, load application instance for given client_id and store it
-        in request.client
+        If request.client was not set, load application instance for given
+        client_id and store it in request.client
         """
 
         # we want to be sure that request has the client attribute!
@@ -141,11 +144,11 @@ def client_authentication_required(self, request, *args, **kwargs):
             * Resource owner password grant
             * Refresh token grant
 
-        If the request contains authorization headers, always authenticate the client no matter
-        the grant type.
+        If the request contains authorization headers, always authenticate the client
+        no matter the grant type.
 
-        If the request does not contain authorization headers, proceed with authentication only if
-        the client is of type `Confidential`.
+        If the request does not contain authorization headers, proceed with authentication
+        only if the client is of type `Confidential`.
 
         If something goes wrong, call oauthlib implementation of the method.
         """
@@ -172,9 +175,10 @@ def authenticate_client(self, request, *args, **kwargs):
 
         First we try to authenticate with HTTP Basic Auth, and that is the PREFERRED
         authentication method.
-        Whether this fails we support including the client credentials in the request-body, but
-        this method is NOT RECOMMENDED and SHOULD be limited to clients unable to directly utilize
-        the HTTP Basic authentication scheme. See rfc:`2.3.1` for more details
+        Whether this fails we support including the client credentials in the request-body,
+        but this method is NOT RECOMMENDED and SHOULD be limited to clients unable to
+        directly utilize the HTTP Basic authentication scheme.
+        See rfc:`2.3.1` for more details
         """
         authenticated = self._authenticate_basic_auth(request)
 

oauth2_provider/templates/oauth2_provider/base.html

@@ -46,6 +46,3 @@
 
 </body>
 </html>
-
-
-