From 0db571b417ce9f9f10e30fae8513fbeaebd55fa7 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sun, 13 Nov 2011 00:43:02 +0000
Subject: [PATCH] Fixed #17134: Corrected Python 2.5 fallback code for parsing
 microseconds in time values. Thanks aaugustin and jcd.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/forms/fields.py                      | 6 ++++--
 tests/regressiontests/forms/tests/fields.py | 4 ++++
 2 files changed, 8 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:
diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/regressiontests/forms/tests/fields.py
index dd55c90111..0f9e91a55e 100644
--- a/tests/regressiontests/forms/tests/fields.py
+++ b/tests/regressiontests/forms/tests/fields.py
@@ -407,6 +407,7 @@ class FieldsTests(SimpleTestCase):
         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, 200), f.clean('2006-10-25 14:30:45.000200'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('2006-10-25 14:30:45.0002'))
         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), f.clean('2006-10-25 14:30:00'))
         self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006-10-25 14:30'))
@@ -452,6 +453,9 @@ class FieldsTests(SimpleTestCase):
         self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean(' 10/25/06 '))
         self.assertRaisesMessage(ValidationError, "[u'Enter a valid date/time.']", f.clean, '   ')
 
+    def test_datetimefield_5(self):
+        f = DateTimeField(input_formats=[u'%Y.%m.%d %H:%M:%S.%f'])
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('2006.10.25 14:30:45.0002'))
     # RegexField ##################################################################
 
     def test_regexfield_1(self):