Ticket #9459: datetimefield-microseconds.diff

tests/regressiontests/forms/fields.py

@@ -560 +560 @@
 datetime.datetime(2006, 10, 25, 14, 30, 59, 200)
 >>> f.clean('2006-10-25 14:30:45')
 datetime.datetime(2006, 10, 25, 14, 30, 45)
+>>> f.clean('2006-10-25 14:30:45.123')
+datetime.datetime(2006, 10, 25, 14, 30, 45, 123)
 >>> f.clean('2006-10-25 14:30:00')
 datetime.datetime(2006, 10, 25, 14, 30)
 >>> f.clean('2006-10-25 14:30')

django/forms/fields.py

@@ -382 +382 @@
             if len(value) != 2:
                 raise ValidationError(self.error_messages['invalid'])
             value = '%s %s' % tuple(value)
+
+        # To support DateTimeField in HiddenInput (incl. microseconds)
+        # YYYY-MM-DD HH:MM:SS.sss
+        if '.' in value:
+            try:
+                value, usecs = value.split('.')
+                usecs = int(usecs)
+            except ValueError:
+                raise ValidationError(self.error_messages['invalid'])
+        else:
+            usecs = 0
+
         for format in self.input_formats:
             try:
-                return datetime.datetime(*time.strptime(value, format)[:6])
+                return datetime.datetime(*time.strptime(value, format)[:6], **{'microsecond': usecs})
             except ValueError:
                 continue
         raise ValidationError(self.error_messages['invalid'])