Skip to content

DateTimeField to_representation can handle strings. Fixes #4013. #4019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

DateTimeField to_representation can handle strings. Fixes #4013. #4019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ead6205
DateTimeField to_representation can handle strings. Fixes #4013.
calumcalder Mar 26, 2016
e61a4f1
DateTimeField to_representation string check str -> six.string_types
calumcalder Mar 27, 2016
8966d8e
DateTimeField tests reflect Python 2's strptime limitations.
calumcalder Mar 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,10 +1072,24 @@ def to_representation(self, value):
return value

if output_format.lower() == ISO_8601:
if isinstance(value, six.string_types):
format_strings = (format_prefix + timezone_extension
for format_prefix in ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S', '%Y-%m-%dT%H:%M:%S.%f')
for timezone_extension in ('', '%Z', '%z'))
for format_string in format_strings:
try:
value = datetime.datetime.strptime(value, format_string)
break
except ValueError:
pass
else:
raise ValueError('DateTime String %s did not match any valid format string.' % value)

value = value.isoformat()
if value.endswith('+00:00'):
value = value[:-6] + 'Z'
return value

return value.strftime(output_format)


Expand Down
10 changes: 10 additions & 0 deletions tests/test_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,16 @@ class TestDateTimeField(FieldValues):
outputs = {
datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00',
datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z',
'2001-01-01T01:01': '2001-01-01T01:01:00',
'2001-01-01T01:01:01': '2001-01-01T01:01:01',
'2001-01-01T01:01:01.01': '2001-01-01T01:01:01.010000',
# Caveat of Python 2's datetime module does not allow '+HHMM' ISO-8601 strings to be parsed in Python 2's strptime
'2001-01-01T01:01+0100' if six.PY3 else None: '2001-01-01T01:01:00+01:00' if six.PY3 else None,
'2001-01-01T01:01:01+0100' if six.PY3 else None: '2001-01-01T01:01:01+01:00' if six.PY3 else None,
'2001-01-01T01:01:01.01+0100' if six.PY3 else None: '2001-01-01T01:01:01.010000+01:00' if six.PY3 else None,
'2001-01-01T01:01UTC': '2001-01-01T01:01:00',
'2001-01-01T01:01:01UTC': '2001-01-01T01:01:01',
'2001-01-01T01:01:01.01UTC': '2001-01-01T01:01:01.010000',
None: None,
'': None,
}
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy