Ticket #17134: 17134_datetime_bug_fix.diff

django/forms/fields.py

@@ -340 +340 @@
                     return self.strptime(value, format)
                 except ValueError:
                     if format.endswith('.%f'):
-                        if value.count('.') != 1:
+                        # Compatibility with datetime in pythons < 2.6. 
+                        # See: http://docs.python.org/library/datetime.html#strftime-and-strptime-behavior
+                        if value.count('.') != format.count('.'):
                             continue
                         try:
                             datetime_str, usecs_str = value.rsplit('.', 1)
-                            usecs = int(usecs_str)
+                            usecs = int(usecs_str[:6].ljust(6, '0'))
                             dt = datetime.datetime.strptime(datetime_str, format[:-3])
                             return dt.replace(microsecond=usecs)
                         except ValueError: