Standardize quotes and add flake8-quotes linter

Author: jleclanche

oauth2_provider/apps.py

@@ -2,5 +2,5 @@
 
 
 class DOTConfig(AppConfig):
-    name = 'oauth2_provider'
+    name = "oauth2_provider"
     verbose_name = "Django OAuth Toolkit"

oauth2_provider/decorators.py

@@ -67,7 +67,7 @@ def _validate(request, *args, **kwargs):
                 )
 
             # Check if method is safe
-            if request.method.upper() in ['GET', 'HEAD', 'OPTIONS']:
+            if request.method.upper() in ["GET", "HEAD", "OPTIONS"]:
                 _scopes.append(oauth2_settings.READ_SCOPE)
             else:
                 _scopes.append(oauth2_settings.WRITE_SCOPE)

oauth2_provider/ext/rest_framework/authentication.py

@@ -7,7 +7,7 @@ class OAuth2Authentication(BaseAuthentication):
     """
     OAuth 2 authentication backend using `django-oauth-toolkit`
     """
-    www_authenticate_realm = 'api'
+    www_authenticate_realm = "api"
 
     def authenticate(self, request):
         """

oauth2_provider/ext/rest_framework/permissions.py

@@ -7,9 +7,9 @@
 from ...settings import oauth2_settings
 
 
-log = logging.getLogger('oauth2_provider')
+log = logging.getLogger("oauth2_provider")
 
-SAFE_HTTP_METHODS = ['GET', 'HEAD', 'OPTIONS']
+SAFE_HTTP_METHODS = ["GET", "HEAD", "OPTIONS"]
 
 
 class TokenHasScope(BasePermission):
@@ -23,22 +23,23 @@ def has_permission(self, request, view):
         if not token:
             return False
 
-        if hasattr(token, 'scope'):  # OAuth 2
+        if hasattr(token, "scope"):  # OAuth 2
             required_scopes = self.get_scopes(request, view)
             log.debug("Required scopes to access resource: {0}".format(required_scopes))
 
             return token.is_valid(required_scopes)
 
-        assert False, ('TokenHasScope requires the'
-                       '`oauth2_provider.rest_framework.OAuth2Authentication` authentication '
-                       'class to be used.')
+        assert False, ("TokenHasScope requires the"
+                       "`oauth2_provider.rest_framework.OAuth2Authentication` authentication "
+                       "class to be used.")
 
     def get_scopes(self, request, view):
         try:
-            return getattr(view, 'required_scopes')
+            return getattr(view, "required_scopes")
         except AttributeError:
             raise ImproperlyConfigured(
-                'TokenHasScope requires the view to define the required_scopes attribute')
+                "TokenHasScope requires the view to define the required_scopes attribute"
+            )
 
 
 class TokenHasReadWriteScope(TokenHasScope):
@@ -80,7 +81,7 @@ def get_scopes(self, request, view):
             scope_type = oauth2_settings.WRITE_SCOPE
 
         required_scopes = [
-            '{0}:{1}'.format(scope, scope_type) for scope in view_scopes
+            "{}:{}".format(scope, scope_type) for scope in view_scopes
         ]
 
         return required_scopes

oauth2_provider/middleware.py

@@ -20,17 +20,17 @@ class OAuth2TokenMiddleware(MiddlewareMixin):
     also request._cached_user field makes AuthenticationMiddleware use that instead of the one from
     the session.
 
-    It also adds 'Authorization' to the 'Vary' header. So that django's cache middleware or a
-    reverse proxy can create proper cache keys
+    It also adds "Authorization" to the "Vary" header, so that django's cache middleware or a
+    reverse proxy can create proper cache keys.
     """
     def process_request(self, request):
         # do something only if request contains a Bearer token
-        if request.META.get('HTTP_AUTHORIZATION', '').startswith('Bearer'):
-            if not hasattr(request, 'user') or request.user.is_anonymous:
+        if request.META.get("HTTP_AUTHORIZATION", "").startswith("Bearer"):
+            if not hasattr(request, "user") or request.user.is_anonymous:
                 user = authenticate(request=request)
                 if user:
                     request.user = request._cached_user = user
 
     def process_response(self, request, response):
-        patch_vary_headers(response, ('Authorization',))
+        patch_vary_headers(response, ("Authorization",))
         return response

oauth2_provider/models.py

@@ -39,38 +39,44 @@ class AbstractApplication(models.Model):
                             the registration process as described in :rfc:`2.2`
     * :attr:`name` Friendly name for the Application
     """
-    CLIENT_CONFIDENTIAL = 'confidential'
-    CLIENT_PUBLIC = 'public'
+    CLIENT_CONFIDENTIAL = "confidential"
+    CLIENT_PUBLIC = "public"
     CLIENT_TYPES = (
-        (CLIENT_CONFIDENTIAL, _('Confidential')),
-        (CLIENT_PUBLIC, _('Public')),
+        (CLIENT_CONFIDENTIAL, _("Confidential")),
+        (CLIENT_PUBLIC, _("Public")),
     )
 
-    GRANT_AUTHORIZATION_CODE = 'authorization-code'
-    GRANT_IMPLICIT = 'implicit'
-    GRANT_PASSWORD = 'password'
-    GRANT_CLIENT_CREDENTIALS = 'client-credentials'
+    GRANT_AUTHORIZATION_CODE = "authorization-code"
+    GRANT_IMPLICIT = "implicit"
+    GRANT_PASSWORD = "password"
+    GRANT_CLIENT_CREDENTIALS = "client-credentials"
     GRANT_TYPES = (
-        (GRANT_AUTHORIZATION_CODE, _('Authorization code')),
-        (GRANT_IMPLICIT, _('Implicit')),
-        (GRANT_PASSWORD, _('Resource owner password-based')),
-        (GRANT_CLIENT_CREDENTIALS, _('Client credentials')),
+        (GRANT_AUTHORIZATION_CODE, _("Authorization code")),
+        (GRANT_IMPLICIT, _("Implicit")),
+        (GRANT_PASSWORD, _("Resource owner password-based")),
+        (GRANT_CLIENT_CREDENTIALS, _("Client credentials")),
     )
 
-    client_id = models.CharField(max_length=100, unique=True,
-                                 default=generate_client_id, db_index=True)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL,
-                             related_name="%(app_label)s_%(class)s",
-                             null=True, blank=True, on_delete=models.CASCADE)
+    client_id = models.CharField(
+        max_length=100, unique=True, default=generate_client_id, db_index=True
+    )
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        related_name="%(app_label)s_%(class)s",
+        null=True, blank=True, on_delete=models.CASCADE
+    )
 
     help_text = _("Allowed URIs list, space separated")
-    redirect_uris = models.TextField(help_text=help_text,
-                                     validators=[validate_uris], blank=True)
+    redirect_uris = models.TextField(
+        blank=True, help_text=help_text, validators=[validate_uris]
+    )
     client_type = models.CharField(max_length=32, choices=CLIENT_TYPES)
-    authorization_grant_type = models.CharField(max_length=32,
-                                                choices=GRANT_TYPES)
-    client_secret = models.CharField(max_length=255, blank=True,
-                                     default=generate_client_secret, db_index=True)
+    authorization_grant_type = models.CharField(
+        max_length=32, choices=GRANT_TYPES
+    )
+    client_secret = models.CharField(
+        max_length=255, blank=True, default=generate_client_secret, db_index=True
+    )
     name = models.CharField(max_length=255, blank=True)
     skip_authorization = models.BooleanField(default=False)
 
@@ -86,9 +92,11 @@ def default_redirect_uri(self):
         if self.redirect_uris:
             return self.redirect_uris.split().pop(0)
 
-        assert False, "If you are using implicit, authorization_code" \
-                      "or all-in-one grant_type, you must define " \
-                      "redirect_uris field in your Application model"
+        assert False, (
+            "If you are using implicit, authorization_code"
+            "or all-in-one grant_type, you must define "
+            "redirect_uris field in your Application model"
+        )
 
     def redirect_uri_allowed(self, uri):
         """
@@ -118,11 +126,11 @@ def clean(self):
             and self.authorization_grant_type \
             in (AbstractApplication.GRANT_AUTHORIZATION_CODE,
                 AbstractApplication.GRANT_IMPLICIT):
-            error = _('Redirect_uris could not be empty with {0} grant_type')
-            raise ValidationError(error.format(self.authorization_grant_type))
+            error = _("Redirect_uris could not be empty with {grant_type} grant_type")
+            raise ValidationError(error.format(grant_type=self.authorization_grant_type))
 
     def get_absolute_url(self):
-        return reverse('oauth2_provider:detail', args=[str(self.id)])
+        return reverse("oauth2_provider:detail", args=[str(self.id)])
 
     def __str__(self):
         return self.name or self.client_id
@@ -141,7 +149,7 @@ def is_usable(self, request):
 
 class Application(AbstractApplication):
     class Meta(AbstractApplication.Meta):
-        swappable = 'OAUTH2_PROVIDER_APPLICATION_MODEL'
+        swappable = "OAUTH2_PROVIDER_APPLICATION_MODEL"
 
 
 @python_2_unicode_compatible
@@ -289,14 +297,17 @@ class AbstractRefreshToken(models.Model):
     * :attr:`access_token` AccessToken instance this refresh token is
                            bounded to
     """
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
-                             related_name="%(app_label)s_%(class)s")
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
+        related_name="%(app_label)s_%(class)s"
+    )
     token = models.CharField(max_length=255, unique=True)
-    application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL,
-                                    on_delete=models.CASCADE)
-    access_token = models.OneToOneField(oauth2_settings.ACCESS_TOKEN_MODEL,
-                                        related_name='refresh_token',
-                                        on_delete=models.CASCADE)
+    application = models.ForeignKey(
+        oauth2_settings.APPLICATION_MODEL, on_delete=models.CASCADE)
+    access_token = models.OneToOneField(
+        oauth2_settings.ACCESS_TOKEN_MODEL, on_delete=models.CASCADE,
+        related_name="refresh_token"
+    )
 
     def revoke(self):
         """

oauth2_provider/oauth2_backends.py

@@ -28,7 +28,7 @@ def _get_escaped_full_path(self, request):
         parsed = list(urlparse(request.get_full_path()))
         unsafe = set(c for c in parsed[4]).difference(urlencoded)
         for c in unsafe:
-            parsed[4] = parsed[4].replace(c, quote(c, safe=b''))
+            parsed[4] = parsed[4].replace(c, quote(c, safe=b""))
 
         return urlunparse(parsed)
 
@@ -62,12 +62,12 @@ def extract_headers(self, request):
         :return: a dictionary with OAuthLib needed headers
         """
         headers = request.META.copy()
-        if 'wsgi.input' in headers:
-            del headers['wsgi.input']
-        if 'wsgi.errors' in headers:
-            del headers['wsgi.errors']
-        if 'HTTP_AUTHORIZATION' in headers:
-            headers['Authorization'] = headers['HTTP_AUTHORIZATION']
+        if "wsgi.input" in headers:
+            del headers["wsgi.input"]
+        if "wsgi.errors" in headers:
+            del headers["wsgi.errors"]
+        if "HTTP_AUTHORIZATION" in headers:
+            headers["Authorization"] = headers["HTTP_AUTHORIZATION"]
 
         return headers
 
@@ -113,18 +113,18 @@ def create_authorization_response(self, request, scopes, credentials, allow):
                 raise oauth2.AccessDeniedError()
 
             # add current user to credentials. this will be used by OAUTH2_VALIDATOR_CLASS
-            credentials['user'] = request.user
+            credentials["user"] = request.user
 
             headers, body, status = self.server.create_authorization_response(
-                uri=credentials['redirect_uri'], scopes=scopes, credentials=credentials)
+                uri=credentials["redirect_uri"], scopes=scopes, credentials=credentials)
             uri = headers.get("Location", None)
 
             return uri, headers, body, status
 
         except oauth2.FatalClientError as error:
-            raise FatalClientError(error=error, redirect_uri=credentials['redirect_uri'])
+            raise FatalClientError(error=error, redirect_uri=credentials["redirect_uri"])
         except oauth2.OAuth2Error as error:
-            raise OAuthToolkitError(error=error, redirect_uri=credentials['redirect_uri'])
+            raise OAuthToolkitError(error=error, redirect_uri=credentials["redirect_uri"])
 
     def create_token_response(self, request):
         """
@@ -180,7 +180,7 @@ def extract_body(self, request):
         :return: provided POST parameters "urlencodable"
         """
         try:
-            body = json.loads(request.body.decode('utf-8')).items()
+            body = json.loads(request.body.decode("utf-8")).items()
         except ValueError:
             body = ""