diff options
Diffstat (limited to 'django/forms')
| -rw-r--r-- | django/forms/fields.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py index 45cc8185c0..4cd2911eaa 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -340,11 +340,13 @@ class BaseTemporalField(Field): 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: |