Merge pull request #4041 from linovia/bug/fix_correct_string_type

xordoquy · xordoquy · commit 10a080d395b8 · 2016-04-07T20:16:25.000+02:00
Fix regression introduced by #4035
diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py
@@ -7,7 +7,7 @@
 
 from django.contrib.auth import authenticate, get_user_model
 from django.middleware.csrf import CsrfViewMiddleware
-from django.utils.six import text_types
+from django.utils.six import text_type
 from django.utils.translation import ugettext_lazy as _
 
 from rest_framework import HTTP_HEADER_ENCODING, exceptions
@@ -20,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, text_types):
+    if isinstance(auth, text_type):
         # Work around django test client oddness
         auth = auth.encode(HTTP_HEADER_ENCODING)
     return auth
