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
dea0f912
Commit
dea0f912
authored
Dec 03, 2012
by
Michal Dvorak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed screwed formatting
parent
ad01fa0e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
rest_framework/fields.py
+6
-7
No files found.
rest_framework/fields.py
View file @
dea0f912
...
...
@@ -28,7 +28,7 @@ def is_simple_callable(obj):
return
(
(
inspect
.
isfunction
(
obj
)
and
not
inspect
.
getargspec
(
obj
)[
0
])
or
(
inspect
.
ismethod
(
obj
)
and
len
(
inspect
.
getargspec
(
obj
)[
0
])
<=
1
)
)
)
class
Field
(
object
):
...
...
@@ -217,7 +217,6 @@ class ModelField(WritableField):
"""
A generic field that can be used against an arbitrary model field.
"""
def
__init__
(
self
,
*
args
,
**
kwargs
):
try
:
self
.
model_field
=
kwargs
.
pop
(
'model_field'
)
...
...
@@ -225,9 +224,9 @@ class ModelField(WritableField):
raise
ValueError
(
"ModelField requires 'model_field' kwarg"
)
self
.
min_length
=
kwargs
.
pop
(
'min_length'
,
getattr
(
self
.
model_field
,
'min_length'
,
None
))
getattr
(
self
.
model_field
,
'min_length'
,
None
))
self
.
max_length
=
kwargs
.
pop
(
'max_length'
,
getattr
(
self
.
model_field
,
'max_length'
,
None
))
getattr
(
self
.
model_field
,
'max_length'
,
None
))
super
(
ModelField
,
self
)
.
__init__
(
*
args
,
**
kwargs
)
...
...
@@ -437,7 +436,7 @@ class PrimaryKeyRelatedField(RelatedField):
# RelatedObject (reverse relationship)
obj
=
getattr
(
obj
,
self
.
source
or
field_name
)
return
self
.
to_native
(
obj
.
pk
)
# Forward relationship
# Forward relationship
return
self
.
to_native
(
pk
)
...
...
@@ -472,7 +471,7 @@ class ManyPrimaryKeyRelatedField(ManyRelatedField):
# RelatedManager (reverse relationship)
queryset
=
getattr
(
obj
,
self
.
source
or
field_name
)
return
[
self
.
to_native
(
item
.
pk
)
for
item
in
queryset
.
all
()]
# Forward relationship
# Forward relationship
return
[
self
.
to_native
(
item
.
pk
)
for
item
in
queryset
.
all
()]
def
from_native
(
self
,
data
):
...
...
@@ -916,7 +915,7 @@ class DateTimeField(WritableField):
# call stack.
warnings
.
warn
(
u"DateTimeField received a naive datetime (
%
s)"
u" while time zone support is active."
%
value
,
RuntimeWarning
)
RuntimeWarning
)
default_timezone
=
timezone
.
get_default_timezone
()
value
=
timezone
.
make_aware
(
value
,
default_timezone
)
return
value
...
...
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