Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
019c6db7
Commit
019c6db7
authored
Apr 07, 2016
by
Xavier Ordoquy
Committed by
Tom Christie
Apr 07, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the string_types / text_types confusion introduced in #4025 (#4035)
parent
78e4ea0d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
rest_framework/authentication.py
+2
-2
No files found.
rest_framework/authentication.py
View file @
019c6db7
...
@@ -7,7 +7,7 @@ import base64
...
@@ -7,7 +7,7 @@ import base64
from
django.contrib.auth
import
authenticate
,
get_user_model
from
django.contrib.auth
import
authenticate
,
get_user_model
from
django.middleware.csrf
import
CsrfViewMiddleware
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
django.utils.translation
import
ugettext_lazy
as
_
from
rest_framework
import
HTTP_HEADER_ENCODING
,
exceptions
from
rest_framework
import
HTTP_HEADER_ENCODING
,
exceptions
...
@@ -20,7 +20,7 @@ def get_authorization_header(request):
...
@@ -20,7 +20,7 @@ def get_authorization_header(request):
Hide some test client ickyness where the header can be unicode.
Hide some test client ickyness where the header can be unicode.
"""
"""
auth
=
request
.
META
.
get
(
'HTTP_AUTHORIZATION'
,
b
''
)
auth
=
request
.
META
.
get
(
'HTTP_AUTHORIZATION'
,
b
''
)
if
isinstance
(
auth
,
string
_types
):
if
isinstance
(
auth
,
text
_types
):
# Work around django test client oddness
# Work around django test client oddness
auth
=
auth
.
encode
(
HTTP_HEADER_ENCODING
)
auth
=
auth
.
encode
(
HTTP_HEADER_ENCODING
)
return
auth
return
auth
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment