Merge pull request jazzband#77 from davesque/remove-python-2

Remove python 2 support

Author: davesque

.travis.yml

@@ -6,7 +6,6 @@ sudo: required
 cache: pip
 
 python:
-    - "2.7"
     - "3.5"
     - "3.6"
     - "3.7"
@@ -25,14 +24,8 @@ matrix:
     exclude:
       - python: "3.7"
         env: DJANGO=1.11
-      - python: "2.7"
-        env: DJANGO=2.0
-      - python: "2.7"
-        env: DJANGO=2.1
       - python: "3.5"
         env: DJANGO=2.1
-      - python: "2.7"
-        env: DJANGO=master
       - python: "3.5"
         env: DJANGO=master
       - python: "3.6"

README.rst

@@ -21,7 +21,7 @@ variable defaults should be safe.
 Requirements
 ------------
 
-* Python (2.7, 3.5, 3.6, 3.7)
+* Python (3.5, 3.6, 3.7)
 * Django (1.11, 2.0, 2.1)
 * Django REST Framework (3.5, 3.6, 3.7, 3.8, 3.9)
 
@@ -290,7 +290,7 @@ generated by the ``TokenObtainPairView``:
   class MyTokenObtainPairSerializer(TokenObtainPairSerializer):
       @classmethod
       def get_token(cls, user):
-          token = super(MyTokenObtainPairSerializer, cls).get_token(user)
+          token = super().get_token(user)
 
           # Add custom claims
           token['name'] = user.name

rest_framework_simplejwt/authentication.py

@@ -1,6 +1,3 @@
-from __future__ import unicode_literals
-
-from django.utils.six import text_type
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import HTTP_HEADER_ENCODING, authentication
 
@@ -53,7 +50,7 @@ def get_header(self, request):
         """
         header = request.META.get('HTTP_AUTHORIZATION')
 
-        if isinstance(header, text_type):
+        if isinstance(header, str):
             # Work around django test client oddness
             header = header.encode(HTTP_HEADER_ENCODING)
 

rest_framework_simplejwt/backends.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext_lazy as _
 from jwt import InvalidTokenError
 import jwt
@@ -17,7 +15,7 @@
 )
 
 
-class TokenBackend(object):
+class TokenBackend:
     def __init__(self, algorithm, signing_key=None, verifying_key=None):
         if algorithm not in ALLOWED_ALGORITHMS:
             raise TokenBackendError(format_lazy(_("Unrecognized algorithm type '{}'"), algorithm))

rest_framework_simplejwt/compat.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import warnings
 
 try:

rest_framework_simplejwt/exceptions.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import exceptions, status
 
@@ -12,7 +10,7 @@ class TokenBackendError(Exception):
     pass
 
 
-class DetailDictMixin(object):
+class DetailDictMixin:
     def __init__(self, detail=None, code=None):
         """
         Builds a detail dictionary for the error to give more information to API
@@ -28,7 +26,7 @@ def __init__(self, detail=None, code=None):
         if code is not None:
             detail_dict['code'] = code
 
-        super(DetailDictMixin, self).__init__(detail_dict)
+        super().__init__(detail_dict)
 
 
 class AuthenticationFailed(DetailDictMixin, exceptions.AuthenticationFailed):

rest_framework_simplejwt/models.py

@@ -1,16 +1,12 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth import models as auth_models
 from django.db.models.manager import EmptyManager
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 
 from .compat import CallableFalse, CallableTrue
 from .settings import api_settings
 
 
-@python_2_unicode_compatible
-class TokenUser(object):
+class TokenUser:
     """
     A dummy user class modeled after django.contrib.auth.models.AnonymousUser.
     Used in conjunction with the `JWTTokenUserAuthentication` backend to

rest_framework_simplejwt/serializers.py

@@ -1,7 +1,4 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth import authenticate
-from django.utils.six import text_type
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 
@@ -17,14 +14,14 @@ def __init__(self, *args, **kwargs):
         kwargs['style']['input_type'] = 'password'
         kwargs['write_only'] = True
 
-        super(PasswordField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 class TokenObtainSerializer(serializers.Serializer):
     username_field = User.USERNAME_FIELD
 
     def __init__(self, *args, **kwargs):
-        super(TokenObtainSerializer, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.fields[self.username_field] = serializers.CharField()
         self.fields['password'] = PasswordField()
@@ -60,12 +57,12 @@ def get_token(cls, user):
         return RefreshToken.for_user(user)
 
     def validate(self, attrs):
-        data = super(TokenObtainPairSerializer, self).validate(attrs)
+        data = super().validate(attrs)
 
         refresh = self.get_token(self.user)
 
-        data['refresh'] = text_type(refresh)
-        data['access'] = text_type(refresh.access_token)
+        data['refresh'] = str(refresh)
+        data['access'] = str(refresh.access_token)
 
         return data
 
@@ -76,11 +73,11 @@ def get_token(cls, user):
         return SlidingToken.for_user(user)
 
     def validate(self, attrs):
-        data = super(TokenObtainSlidingSerializer, self).validate(attrs)
+        data = super().validate(attrs)
 
         token = self.get_token(self.user)
 
-        data['token'] = text_type(token)
+        data['token'] = str(token)
 
         return data
 
@@ -91,7 +88,7 @@ class TokenRefreshSerializer(serializers.Serializer):
     def validate(self, attrs):
         refresh = RefreshToken(attrs['refresh'])
 
-        data = {'access': text_type(refresh.access_token)}
+        data = {'access': str(refresh.access_token)}
 
         if api_settings.ROTATE_REFRESH_TOKENS:
             if api_settings.BLACKLIST_AFTER_ROTATION:
@@ -106,7 +103,7 @@ def validate(self, attrs):
             refresh.set_jti()
             refresh.set_exp()
 
-            data['refresh'] = text_type(refresh)
+            data['refresh'] = str(refresh)
 
         return data
 
@@ -124,7 +121,7 @@ def validate(self, attrs):
         # Update the "exp" claim
         token.set_exp()
 
-        return {'token': text_type(token)}
+        return {'token': str(token)}
 
 
 class TokenVerifySerializer(serializers.Serializer):

rest_framework_simplejwt/settings.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from datetime import timedelta
 
 from django.conf import settings

rest_framework_simplejwt/state.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth import get_user_model
 
 from .backends import TokenBackend

rest_framework_simplejwt/token_blacklist/admin.py

@@ -22,7 +22,7 @@ class OutstandingTokenAdmin(admin.ModelAdmin):
     )
 
     def get_queryset(self, *args, **kwargs):
-        qs = super(OutstandingTokenAdmin, self).get_queryset(*args, **kwargs)
+        qs = super().get_queryset(*args, **kwargs)
 
         return qs.select_related('user')
 
@@ -41,7 +41,7 @@ def has_delete_permission(self, *args, **kwargs):
     def has_change_permission(self, request, obj=None):
         return (
             request.method in ['GET', 'HEAD'] and
-            super(OutstandingTokenAdmin, self).has_change_permission(request, obj)
+            super().has_change_permission(request, obj)
         )
 
 admin.site.register(OutstandingToken, OutstandingTokenAdmin)
@@ -64,7 +64,7 @@ class BlacklistedTokenAdmin(admin.ModelAdmin):
     )
 
     def get_queryset(self, *args, **kwargs):
-        qs = super(BlacklistedTokenAdmin, self).get_queryset(*args, **kwargs)
+        qs = super().get_queryset(*args, **kwargs)
 
         return qs.select_related('token__user')
 

rest_framework_simplejwt/token_blacklist/models.py

@@ -2,10 +2,8 @@
 
 from django.conf import settings
 from django.db import models
-from django.utils.six import python_2_unicode_compatible
 
 
-@python_2_unicode_compatible
 class OutstandingToken(models.Model):
     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True, blank=True)
 
@@ -31,7 +29,6 @@ def __str__(self):
         )
 
 
-@python_2_unicode_compatible
 class BlacklistedToken(models.Model):
     token = models.OneToOneField(OutstandingToken, on_delete=models.CASCADE)
 

rest_framework_simplejwt/tokens.py

@@ -1,10 +1,7 @@
-from __future__ import unicode_literals
-
 from datetime import timedelta
 from uuid import uuid4
 
 from django.conf import settings
-from django.utils.six import python_2_unicode_compatible, text_type
 from django.utils.translation import ugettext_lazy as _
 
 from .exceptions import TokenBackendError, TokenError
@@ -15,8 +12,7 @@
 )
 
 
-@python_2_unicode_compatible
-class Token(object):
+class Token:
     """
     A class which validates and wraps an existing JWT or can be used to build a
     new JWT.
@@ -164,15 +160,15 @@ def for_user(cls, user):
         """
         user_id = getattr(user, api_settings.USER_ID_FIELD)
         if not isinstance(user_id, int):
-            user_id = text_type(user_id)
+            user_id = str(user_id)
 
         token = cls()
         token[api_settings.USER_ID_CLAIM] = user_id
 
         return token
 
 
-class BlacklistMixin(object):
+class BlacklistMixin:
     """
     If the `rest_framework_simplejwt.token_blacklist` app was configured to be
     used, tokens created from `BlacklistMixin` subclasses will insert
@@ -183,7 +179,7 @@ class BlacklistMixin(object):
         def verify(self, *args, **kwargs):
             self.check_blacklist()
 
-            super(BlacklistMixin, self).verify(*args, **kwargs)
+            super().verify(*args, **kwargs)
 
         def check_blacklist(self):
             """
@@ -219,7 +215,7 @@ def for_user(cls, user):
             """
             Adds this token to the outstanding token list.
             """
-            token = super(BlacklistMixin, cls).for_user(user)
+            token = super().for_user(user)
 
             jti = token['jti']
             exp = token['exp']
@@ -240,7 +236,7 @@ class SlidingToken(BlacklistMixin, Token):
     lifetime = api_settings.SLIDING_TOKEN_LIFETIME
 
     def __init__(self, *args, **kwargs):
-        super(SlidingToken, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         if self.token is None:
             # Set sliding refresh expiration claim if new token

rest_framework_simplejwt/utils.py

@@ -1,10 +1,7 @@
-from __future__ import unicode_literals
-
 from calendar import timegm
 from datetime import datetime
 
 from django.conf import settings
-from django.utils import six
 from django.utils.functional import lazy
 from django.utils.timezone import is_naive, make_aware, utc
 
@@ -31,4 +28,4 @@ def datetime_from_epoch(ts):
 def format_lazy(s, *args, **kwargs):
     return s.format(*args, **kwargs)
 
-format_lazy = lazy(format_lazy, six.text_type)
+format_lazy = lazy(format_lazy, str)

rest_framework_simplejwt/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from rest_framework import generics, status
 from rest_framework.response import Response
 

runtests.py

@@ -1,6 +1,4 @@
 #! /usr/bin/env python
-from __future__ import print_function, unicode_literals
-
 import os
 import subprocess
 import sys

setup.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from io import open
 import os
 import re

tests/conftest.py

@@ -1,6 +1,3 @@
-from __future__ import unicode_literals
-
-
 def pytest_configure():
     from django.conf import settings