diff --git a/dvadmin-backend/apps/vadmin/op_drf/filters.py b/dvadmin-backend/apps/vadmin/op_drf/filters.py index b250cd3..62b1b9b 100644 --- a/dvadmin-backend/apps/vadmin/op_drf/filters.py +++ b/dvadmin-backend/apps/vadmin/op_drf/filters.py @@ -6,7 +6,7 @@ import logging import operator from functools import reduce -from django.utils import six +# from django.utils import six from mongoengine.queryset import visitor from rest_framework.filters import BaseFilterBackend, SearchFilter, OrderingFilter @@ -34,7 +34,7 @@ class MongoSearchFilter(SearchFilter): if not search_fields or not search_terms: return queryset orm_lookups = [ - self.construct_search(six.text_type(search_field)) + self.construct_search(str(search_field)) for search_field in search_fields ] if not orm_lookups: @@ -67,7 +67,7 @@ class MongoOrderingFilter(OrderingFilter): ] else: valid_fields = [ - (item, item) if isinstance(item, six.string_types) else item + (item, item) if isinstance(item, str) else item for item in valid_fields ] diff --git a/dvadmin-backend/apps/vadmin/utils/authentication.py b/dvadmin-backend/apps/vadmin/utils/authentication.py index 3187058..2a61cb9 100644 --- a/dvadmin-backend/apps/vadmin/utils/authentication.py +++ b/dvadmin-backend/apps/vadmin/utils/authentication.py @@ -7,7 +7,7 @@ import jwt from django.conf import settings from django.contrib.auth import get_user_model from django.core.cache import cache -from django.utils.six import text_type +# from django.utils.six import text_type from django.utils.translation import ugettext as _ from rest_framework import exceptions from rest_framework_jwt.utils import jwt_decode_handler @@ -61,7 +61,7 @@ class OpAuthJwtAuthentication(object): :return: """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, text_type): + if isinstance(auth, str): auth = auth.encode(settings.JWT_AUTH.get('HTTP_HEADER_ENCODING', 'iso-8859-1')) if not auth: return '' diff --git a/dvadmin-backend/requirements.txt b/dvadmin-backend/requirements.txt index 9b36e47..a45bce6 100644 Binary files a/dvadmin-backend/requirements.txt and b/dvadmin-backend/requirements.txt differ