Skip to content

Commit

Permalink
Merge pull request encode#4041 from linovia/bug/fix_correct_string_type
Browse files Browse the repository at this point in the history
Fix regression introduced by encode#4035
  • Loading branch information
xordoquy committed Apr 7, 2016
2 parents 019c6db + 29a2e54 commit 10a080d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rest_framework/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 10a080d

Please sign in to comment.