Skip to content

Fix the string_types / text_types confusion introduced in #4025 #4035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 1 commit into from
Apr 7, 2016
Merged

Fix the string_types / text_types confusion introduced in #4025 #4035

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix the string_types / text_types confusion introduced in #4025
  • Loading branch information
@xordoquy
xordoquy committed Apr 5, 2016
commit 763aab6b457370897d32c36d895a70cb0e980c28
4 changes: 2 additions & 2 deletions rest_framework/authentication.py
View file
Open in desktop
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 string_types
from django.utils.six import text_types
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, string_types):
if isinstance(auth, text_types):
# Work around django test client oddness
auth = auth.encode(HTTP_HEADER_ENCODING)
return auth
Expand Down