mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-26 03:23:59 +03:00
Merge branch 'master' of github.com:tomchristie/django-rest-framework
This commit is contained in:
commit
e9e88cbc60
|
@ -501,7 +501,7 @@ For example, given the following model for a tag, which has a generic relationsh
|
|||
tagged_object = GenericForeignKey('content_type', 'object_id')
|
||||
|
||||
def __unicode__(self):
|
||||
return self.tag
|
||||
return self.tag_name
|
||||
|
||||
And the following two models, which may be have associated tags:
|
||||
|
||||
|
|
|
@ -1189,7 +1189,7 @@ class DurationField(Field):
|
|||
def to_internal_value(self, value):
|
||||
if isinstance(value, datetime.timedelta):
|
||||
return value
|
||||
parsed = parse_duration(value)
|
||||
parsed = parse_duration(six.text_type(value))
|
||||
if parsed is not None:
|
||||
return parsed
|
||||
self.fail('invalid', format='[DD] [HH:[MM:]]ss[.uuuuuu]')
|
||||
|
|
|
@ -1069,6 +1069,7 @@ class TestDurationField(FieldValues):
|
|||
'3 08:32:01.000123': datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123),
|
||||
'08:01': datetime.timedelta(minutes=8, seconds=1),
|
||||
datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123): datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123),
|
||||
3600: datetime.timedelta(hours=1),
|
||||
}
|
||||
invalid_inputs = {
|
||||
'abc': ['Duration has wrong format. Use one of these formats instead: [DD] [HH:[MM:]]ss[.uuuuuu].'],
|
||||
|
|
Loading…
Reference in New Issue
Block a user