diff options
| -rw-r--r-- | django/newforms/fields.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/django/newforms/fields.py b/django/newforms/fields.py index a39987e1b5..26935140c3 100644 --- a/django/newforms/fields.py +++ b/django/newforms/fields.py @@ -300,6 +300,12 @@ class DateTimeField(Field): 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]) |