From be661824ac2154d7ec7c674df46682cd6e9b4da4 Mon Sep 17 00:00:00 2001 From: Damien Nozay Date: Sun, 4 Jan 2015 12:27:58 -0800 Subject: [PATCH] Allow DateTimeField to specify defaults directly on class --- rest_framework/fields.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e7426314d..de767c08e 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -828,10 +828,10 @@ class DateTimeField(Field): input_formats = api_settings.DATETIME_INPUT_FORMATS default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None - def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs): - 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.default_timezone = default_timezone if default_timezone is not None else self.default_timezone + def __init__(self, *args, **kwargs): + self.format = kwargs.pop('format', self.format) + self.default_timezone = kwargs.pop('default_timezone', self.default_timezone) + self.input_formats = kwargs.pop('input_formats', self.input_formats) super(DateTimeField, self).__init__(*args, **kwargs) def enforce_timezone(self, value):