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
9a228116
Commit
9a228116
authored
May 24, 2017
by
imdark
Committed by
GitHub
May 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modified to use a reader
modified to use a reader since direct decoding is not supported
parent
3a2ad8e6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
rest_framework/parsers.py
+2
-2
No files found.
rest_framework/parsers.py
View file @
9a228116
...
@@ -7,6 +7,7 @@ on the request, such as form content or json encoded data.
...
@@ -7,6 +7,7 @@ on the request, such as form content or json encoded data.
from
__future__
import
unicode_literals
from
__future__
import
unicode_literals
import
json
import
json
import
codecs
from
django.conf
import
settings
from
django.conf
import
settings
from
django.core.files.uploadhandler
import
StopFutureHandlers
from
django.core.files.uploadhandler
import
StopFutureHandlers
...
@@ -22,7 +23,6 @@ from django.utils.six.moves.urllib import parse as urlparse
...
@@ -22,7 +23,6 @@ from django.utils.six.moves.urllib import parse as urlparse
from
rest_framework
import
renderers
from
rest_framework
import
renderers
from
rest_framework.exceptions
import
ParseError
from
rest_framework.exceptions
import
ParseError
import
codecs
class
DataAndFiles
(
object
):
class
DataAndFiles
(
object
):
...
@@ -62,7 +62,7 @@ class JSONParser(BaseParser):
...
@@ -62,7 +62,7 @@ class JSONParser(BaseParser):
encoding
=
parser_context
.
get
(
'encoding'
,
settings
.
DEFAULT_CHARSET
)
encoding
=
parser_context
.
get
(
'encoding'
,
settings
.
DEFAULT_CHARSET
)
try
:
try
:
decoded_stream
=
codecs
.
decode
(
stream
,
encoding
)
decoded_stream
=
codecs
.
getreader
(
encoding
)(
stream
)
return
json
.
load
(
decoded_stream
)
return
json
.
load
(
decoded_stream
)
except
ValueError
as
exc
:
except
ValueError
as
exc
:
raise
ParseError
(
'JSON parse error -
%
s'
%
six
.
text_type
(
exc
))
raise
ParseError
(
'JSON parse error -
%
s'
%
six
.
text_type
(
exc
))
...
...
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