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
2966c343
Commit
2966c343
authored
Jan 12, 2012
by
Michele Lazzeri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correct complex data xml parsing
parent
6b3792ae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
13 deletions
+8
-13
djangorestframework/parsers.py
+8
-13
No files found.
djangorestframework/parsers.py
View file @
2966c343
...
@@ -187,12 +187,11 @@ class XMLParser(BaseParser):
...
@@ -187,12 +187,11 @@ class XMLParser(BaseParser):
`data` will simply be a string representing the body of the request.
`data` will simply be a string representing the body of the request.
`files` will always be `None`.
`files` will always be `None`.
"""
"""
data
=
{}
tree
=
ET
.
parse
(
stream
)
tree
=
ET
.
parse
(
stream
)
data
=
self
.
_xml_convert
(
tree
.
getroot
())
data
=
self
.
_xml_convert
(
tree
.
getroot
())
return
(
data
,
None
)
return
(
data
,
None
)
def
_xml_convert
(
self
,
element
):
def
_xml_convert
(
self
,
element
):
"""
"""
convert the xml `element` into the corresponding python object
convert the xml `element` into the corresponding python object
...
@@ -203,19 +202,15 @@ class XMLParser(BaseParser):
...
@@ -203,19 +202,15 @@ class XMLParser(BaseParser):
if
len
(
children
)
==
0
:
if
len
(
children
)
==
0
:
return
self
.
_type_convert
(
element
.
text
)
return
self
.
_type_convert
(
element
.
text
)
else
:
else
:
if
element
.
tag
==
"resource"
:
# if the fist child tag is list-item means all children are list-item
if
children
[
0
]
.
tag
==
"list-item"
:
data
=
[]
data
=
[]
for
child
in
children
:
for
child
in
children
:
data
.
append
(
self
.
_xml_convert
(
child
))
data
.
append
(
self
.
_xml_convert
(
child
))
else
:
else
:
if
children
[
0
]
.
tag
==
"resource"
:
data
=
{}
data
=
[]
for
child
in
children
:
for
child
in
children
:
data
[
child
.
tag
]
=
self
.
_xml_convert
(
child
)
data
.
append
(
self
.
_xml_convert
(
child
))
else
:
data
=
{}
for
child
in
children
:
data
[
child
.
tag
]
=
self
.
_xml_convert
(
child
)
return
data
return
data
...
...
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