encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-11-01 00:17:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3093 from sorreltree/master

Browse Source 
Ability to customize DateTimeField with a custom datetime_parser
This commit is contained in:
Tom Christie 2015-07-02 11:21:25 +01:00
commit 6d79ea2cde
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/fields.py
View File

@ -889,11 +889,13 @@ class DateTimeField(Field):
format = api_settings.DATETIME_FORMAT format = api_settings.DATETIME_FORMAT
input_formats = api_settings.DATETIME_INPUT_FORMATS input_formats = api_settings.DATETIME_INPUT_FORMATS
default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None
datetime_parser = datetime.datetime.strptime
def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs): def __init__(self, format=empty, datetime_parser=None, input_formats=None, default_timezone=None, *args, **kwargs):
self.format = format if format is not empty else self.format self.format = format if format is not empty else self.format
self.input_formats = input_formats if input_formats is not None else self.input_formats self.input_formats = input_formats if input_formats is not None else self.input_formats
self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone
self.datetime_parser = datetime_parser if datetime_parser is not None else self.datetime_parser
super(DateTimeField, self).__init__(*args, **kwargs) super(DateTimeField, self).__init__(*args, **kwargs)
def enforce_timezone(self, value): def enforce_timezone(self, value):
@ -925,7 +927,7 @@ class DateTimeField(Field):
return self.enforce_timezone(parsed) return self.enforce_timezone(parsed)
else: else:
try: try:
parsed = datetime.datetime.strptime(value, format) parsed = self.datetime_parser(value, format)
except (ValueError, TypeError): except (ValueError, TypeError):
pass pass
else: else: