From c22b92a66ca3bb740b8561f660883149953026e0 Mon Sep 17 00:00:00 2001 From: Nitesh Lohchab Date: Sun, 3 Apr 2016 00:07:45 +0530 Subject: [PATCH 1/2] type('') to str --- rest_framework/authentication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 0ca90873eb..0cd2dd0db6 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -19,7 +19,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, type('')): + if isinstance(auth, str): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth From 09aa8f76c44197550e86dfd864fee61425346db8 Mon Sep 17 00:00:00 2001 From: Nitesh Lohchab Date: Sun, 3 Apr 2016 18:39:32 +0530 Subject: [PATCH 2/2] python2.x and 3.x compatible --- rest_framework/authentication.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 0cd2dd0db6..23ef49d69f 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -7,6 +7,7 @@ from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware +from django.utils.six import string_types from django.utils.translation import ugettext_lazy as _ from rest_framework import HTTP_HEADER_ENCODING, exceptions @@ -19,7 +20,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, str): + if isinstance(auth, string_types): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth