Author: kmtracey
Date: 2011-11-12 16:43:02 -0800 (Sat, 12 Nov 2011)
New Revision: 17092
Modified:
django/trunk/django/forms/fields.py
django/trunk/tests/regressiontests/forms/tests/fields.py
Log:
Fixed #17134: Corrected Python 2.5 fallback code for parsing microseconds in
time values. Thanks aaugustin and jcd.
Modified: django/trunk/django/forms/fields.py
===================================================================
--- django/trunk/django/forms/fields.py 2011-11-12 23:07:51 UTC (rev 17091)
+++ django/trunk/django/forms/fields.py 2011-11-13 00:43:02 UTC (rev 17092)
@@ -340,11 +340,13 @@
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:
Modified: django/trunk/tests/regressiontests/forms/tests/fields.py
===================================================================
--- django/trunk/tests/regressiontests/forms/tests/fields.py 2011-11-12
23:07:51 UTC (rev 17091)
+++ django/trunk/tests/regressiontests/forms/tests/fields.py 2011-11-13
00:43:02 UTC (rev 17092)
@@ -407,6 +407,7 @@
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 @@
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):
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
