Commit 5e047ed8 authored by Claude Paroz's avatar Claude Paroz
Browse files

Removed pre-2.6 compatibility code in date-based form fields. Refs #9459. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 38115ea7

django/forms/fields.py

+1 −12
Original line number Diff line number Diff line
@@ -340,17 +340,6 @@ class BaseTemporalField(Field): 
            for format in self.input_formats:

                try:

                    return self.strptime(value, format)

                except ValueError:

                    if format.endswith('.%f'):

                        # 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[:6].ljust(6, '0'))

                            dt = datetime.datetime.strptime(datetime_str, format[:-3])

                            return dt.replace(microsecond=usecs)

                except ValueError:

                    continue

        raise ValidationError(self.error_messages['invalid'])