Ticket #9459: datetime-microseconds-py25.patch

django/conf/global_settings.py

@@ -350 +350 @@
 # * Note that these format strings are different from the ones to display dates
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'

django/forms/fields.py

@@ -5 +5 @@
 import datetime
 import os
 import re
+import sys
 import time
 import urlparse
 import warnings
@@ -401 +402 @@
                 raise ValidationError(self.error_messages['invalid'])
             value = '%s %s' % tuple(value)
         for format in self.input_formats or formats.get_format('DATETIME_INPUT_FORMATS'):
+            if format.endswith('.%f') and sys.version_info<=(2,6) and value.count('.')==1:
+                try: 
+                    value, usecs = value.rsplit('.', 1) 
+                    usecs = int(usecs) 
+                    return datetime.datetime(*time.strptime(value, format[:-3])[:6]+(usecs,))
+                except ValueError: 
+                    continue
             try:
-                return datetime.datetime(*time.strptime(value, format)[:6])
+                return datetime.datetime.strptime(value, format)
             except ValueError:
                 continue
         raise ValidationError(self.error_messages['invalid'])

tests/regressiontests/forms/fields.py

@@ -320 +320 @@
         self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 59), f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59)))
         self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 59, 200), f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59, 200)))
         self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean('2006-10-25 14:30:45'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('2006-10-25 14:30:45.000200'))
         self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006-10-25 14:30:00'))
         self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006-10-25 14:30'))
         self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean('2006-10-25'))