Author: mtredinnick
Date: 2007-10-22 08:13:12 -0500 (Mon, 22 Oct 2007)
New Revision: 6594
Modified:
django/trunk/django/newforms/widgets.py
django/trunk/tests/regressiontests/forms/widgets.py
Log:
Fixed #5794 -- Be more robust when rendering a DateTimeInput widget. Thanks,
MikeH.
Modified: django/trunk/django/newforms/widgets.py
===================================================================
--- django/trunk/django/newforms/widgets.py 2007-10-22 00:52:54 UTC (rev
6593)
+++ django/trunk/django/newforms/widgets.py 2007-10-22 13:13:12 UTC (rev
6594)
@@ -161,8 +161,11 @@
self.format = format
def render(self, name, value, attrs=None):
- return super(DateTimeInput, self).render(name,
- value.strftime(self.format), attrs)
+ if value is None:
+ value = ''
+ elif hasattr(value, 'strftime'):
+ value = value.strftime(self.format)
+ return super(DateTimeInput, self).render(name, value, attrs)
class CheckboxInput(Widget):
def __init__(self, attrs=None, check_test=bool):
Modified: django/trunk/tests/regressiontests/forms/widgets.py
===================================================================
--- django/trunk/tests/regressiontests/forms/widgets.py 2007-10-22 00:52:54 UTC
(rev 6593)
+++ django/trunk/tests/regressiontests/forms/widgets.py 2007-10-22 13:13:12 UTC
(rev 6594)
@@ -855,6 +855,8 @@
# DateTimeInput ###############################################################
>>> w = DateTimeInput()
+>>> w.render('date', None)
+u'<input type="text" name="date" />'
>>> d = datetime.datetime(2007, 9, 17, 12, 51, 34, 482548)
>>> print d
2007-09-17 12:51:34.482548
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
