From 5e047ed859251d8019a185262b8f5abf5966af09 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 5 Apr 2012 14:49:02 +0000 Subject: [PATCH] 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 --- django/forms/fields.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/django/forms/fields.py b/django/forms/fields.py index 216bb4c489..49f29db723 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -341,18 +341,7 @@ class BaseTemporalField(Field): 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 + continue raise ValidationError(self.error_messages['invalid']) def strptime(self, value, format):