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
4007b564
Commit
4007b564
authored
Nov 22, 2012
by
Xavier Ordoquy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
28 tests passes now.
parent
be003145
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
rest_framework/serializers.py
+6
-4
No files found.
rest_framework/serializers.py
View file @
4007b564
import
six
import
copy
import
copy
import
datetime
import
datetime
import
types
import
types
...
@@ -54,7 +56,7 @@ def _get_declared_fields(bases, attrs):
...
@@ -54,7 +56,7 @@ def _get_declared_fields(bases, attrs):
Note that all fields from the base classes are used.
Note that all fields from the base classes are used.
"""
"""
fields
=
[(
field_name
,
attrs
.
pop
(
field_name
))
fields
=
[(
field_name
,
attrs
.
pop
(
field_name
))
for
field_name
,
obj
in
attrs
.
items
(
)
for
field_name
,
obj
in
list
(
six
.
iteritems
(
attrs
)
)
if
isinstance
(
obj
,
Field
)]
if
isinstance
(
obj
,
Field
)]
fields
.
sort
(
key
=
lambda
x
:
x
[
1
]
.
creation_counter
)
fields
.
sort
(
key
=
lambda
x
:
x
[
1
]
.
creation_counter
)
...
@@ -63,7 +65,7 @@ def _get_declared_fields(bases, attrs):
...
@@ -63,7 +65,7 @@ def _get_declared_fields(bases, attrs):
# in order to the correct order of fields.
# in order to the correct order of fields.
for
base
in
bases
[::
-
1
]:
for
base
in
bases
[::
-
1
]:
if
hasattr
(
base
,
'base_fields'
):
if
hasattr
(
base
,
'base_fields'
):
fields
=
base
.
base_fields
.
items
(
)
+
fields
fields
=
list
(
base
.
base_fields
.
items
()
)
+
fields
return
SortedDict
(
fields
)
return
SortedDict
(
fields
)
...
@@ -315,8 +317,8 @@ class BaseSerializer(Field):
...
@@ -315,8 +317,8 @@ class BaseSerializer(Field):
return
self
.
object
return
self
.
object
class
Serializer
(
BaseSerializer
):
class
Serializer
(
six
.
with_metaclass
(
SerializerMetaclass
,
BaseSerializer
)
):
__metaclass__
=
SerializerMetacl
ass
p
ass
class
ModelSerializerOptions
(
SerializerOptions
):
class
ModelSerializerOptions
(
SerializerOptions
):
...
...
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