Ticket #13205: django-empty-datetimefield.patch

django/forms/fields.py

@@ -376 +376 @@
         Python datetime.datetime object.
         """
         super(DateTimeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return None
-        if isinstance(value, datetime.datetime):
-            return value
-        if isinstance(value, datetime.date):
-            return datetime.datetime(value.year, value.month, value.day)
         if isinstance(value, list):
             # Input comes from a SplitDateTimeWidget, for example. So, it's two
             # components: date and time.
             if len(value) != 2:
                 raise ValidationError(self.error_messages['invalid'])
+            if value[0] in EMPTY_VALUES and value[1] in EMPTY_VALUES:
+                return None
             value = '%s %s' % tuple(value)
+        elif value in EMPTY_VALUES:
+            return None
+        if isinstance(value, datetime.datetime):
+            return value
+        if isinstance(value, datetime.date):
+            return datetime.datetime(value.year, value.month, value.day)
         for format in self.input_formats:
             try:
                 return datetime.datetime(*time.strptime(value, format)[:6])

tests/regressiontests/forms/fields.py

@@ -640 +640 @@
 >>> f.clean('')
 >>> repr(f.clean(''))
 'None'
+>>> f.clean(['', ''])
+>>> repr(f.clean(['', '']))
+'None'
+>>> f.clean([None, None])
+>>> repr(f.clean([None, None]))
+'None'
+>>> f.clean(['', None])
+>>> repr(f.clean(['', None]))
+'None'
+>>> f.clean([None, ''])
+>>> repr(f.clean([None, '']))
+'None'
 
 # RegexField ##################################################################