Permalink
Browse files

DateTimeField can now clean values that come from SplitDateTimeWidget.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent d79c6a0 commit f5831b03c908d9d4bf59f0a0cef4e3db221367ca @malcolmt malcolmt committed Oct 21, 2007
Showing with 6 additions and 0 deletions.
  1. +6 −0 django/newforms/fields.py
View
6 django/newforms/fields.py
@@ -300,6 +300,12 @@ def clean(self, value):
return value
if isinstance(value, datetime.date):
return datetime.datetime(value.year, value.month, value.day)
+ if isinstance(value, list):
+ # Input comes from a SplitDateTimeWidget, for example. So, it's two
+ # components: date and time.
+ if len(value) != 2:
+ raise ValidationError(ugettext(u'Enter a valid date/time.'))
+ value = '%s %s' % tuple(value)
for format in self.input_formats:
try:
return datetime.datetime(*time.strptime(value, format)[:6])

0 comments on commit f5831b0

Please sign in to comment.