Skip to content

type('') to str #4025

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
jpadilla merged 2 commits into from
Apr 3, 2016
Merged

type('') to str #4025

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c22b92a
type('') to str
niteshCoditas Apr 2, 2016
09aa8f7
python2.x and 3.x compatible
niteshCoditas Apr 3, 2016
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
Prev Previous commit
python2.x and 3.x compatible
  • Loading branch information
@niteshCoditas
niteshCoditas committed Apr 3, 2016
commit 09aa8f76c44197550e86dfd864fee61425346db8
3 changes: 2 additions & 1 deletion rest_framework/authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down