Fixed #11385 -- Made forms.DateTimeField accept ISO 8601 date inputs.

Thanks José Padilla for the initial patch, and Carlton Gibson for the
review.

2 files changed, 37 insertions, 10 deletions

diff --git a/tests/forms_tests/field_tests/test_datetimefield.py b/tests/forms_tests/field_tests/test_datetimefield.py
index 5cb527b3f6..50f1d8e557 100644
--- a/tests/forms_tests/field_tests/test_datetimefield.py
+++ b/tests/forms_tests/field_tests/test_datetimefield.py
@@ -2,6 +2,7 @@ from datetime import date, datetime
 
 from django.forms import DateTimeField, ValidationError
 from django.test import SimpleTestCase
+from django.utils.timezone import get_fixed_timezone, utc
 
 
 class DateTimeFieldTest(SimpleTestCase):
@@ -31,6 +32,19 @@ class DateTimeFieldTest(SimpleTestCase):
             ('10/25/06 14:30:00', datetime(2006, 10, 25, 14, 30)),
             ('10/25/06 14:30', datetime(2006, 10, 25, 14, 30)),
             ('10/25/06', datetime(2006, 10, 25, 0, 0)),
+            # ISO 8601 formats.
+            (
+                '2014-09-23T22:34:41.614804',
+                datetime(2014, 9, 23, 22, 34, 41, 614804),
+            ),
+            ('2014-09-23T22:34:41', datetime(2014, 9, 23, 22, 34, 41)),
+            ('2014-09-23T22:34', datetime(2014, 9, 23, 22, 34)),
+            ('2014-09-23', datetime(2014, 9, 23, 0, 0)),
+            ('2014-09-23T22:34Z', datetime(2014, 9, 23, 22, 34, tzinfo=utc)),
+            (
+                '2014-09-23T22:34+07:00',
+                datetime(2014, 9, 23, 22, 34, tzinfo=get_fixed_timezone(420)),
+            ),
             # Whitespace stripping.
             (' 2006-10-25   14:30:45 ', datetime(2006, 10, 25, 14, 30, 45)),
             (' 2006-10-25 ', datetime(2006, 10, 25, 0, 0)),
@@ -39,6 +53,11 @@ class DateTimeFieldTest(SimpleTestCase):
             (' 10/25/2006 ', datetime(2006, 10, 25, 0, 0)),
             (' 10/25/06 14:30:45 ', datetime(2006, 10, 25, 14, 30, 45)),
             (' 10/25/06 ', datetime(2006, 10, 25, 0, 0)),
+            (
+                ' 2014-09-23T22:34:41.614804 ',
+                datetime(2014, 9, 23, 22, 34, 41, 614804),
+            ),
+            (' 2014-09-23T22:34Z ', datetime(2014, 9, 23, 22, 34, tzinfo=utc)),
         ]
         f = DateTimeField()
         for value, expected_datetime in tests:
@@ -54,9 +73,11 @@ class DateTimeFieldTest(SimpleTestCase):
             f.clean('2006-10-25 4:30 p.m.')
         with self.assertRaisesMessage(ValidationError, msg):
             f.clean('   ')
+        with self.assertRaisesMessage(ValidationError, msg):
+            f.clean('2014-09-23T28:23')
         f = DateTimeField(input_formats=['%Y %m %d %I:%M %p'])
         with self.assertRaisesMessage(ValidationError, msg):
-            f.clean('2006-10-25 14:30:45')
+            f.clean('2006.10.25 14:30:45')
 
     def test_datetimefield_clean_input_formats(self):
         tests = [
@@ -72,6 +93,8 @@ class DateTimeFieldTest(SimpleTestCase):
                     datetime(2006, 10, 25, 14, 30, 59, 200),
                 ),
                 ('2006 10 25 2:30 PM', datetime(2006, 10, 25, 14, 30)),
+                # ISO-like formats are always accepted.
+                ('2006-10-25 14:30:45', datetime(2006, 10, 25, 14, 30, 45)),
             )),
             ('%Y.%m.%d %H:%M:%S.%f', (
                 (
diff --git a/tests/forms_tests/tests/test_input_formats.py b/tests/forms_tests/tests/test_input_formats.py
index 690a338f4e..e7aabf74b3 100644
--- a/tests/forms_tests/tests/test_input_formats.py
+++ b/tests/forms_tests/tests/test_input_formats.py
@@ -703,7 +703,7 @@ class LocalizedDateTimeTests(SimpleTestCase):
         f = forms.DateTimeField(input_formats=["%H.%M.%S %m.%d.%Y", "%H.%M %m-%d-%Y"], localize=True)
         # Parse a date in an unaccepted format; get an error
         with self.assertRaises(forms.ValidationError):
-            f.clean('2010-12-21 13:30:05')
+            f.clean('2010/12/21 13:30:05')
         with self.assertRaises(forms.ValidationError):
             f.clean('1:30:05 PM 21/12/2010')
         with self.assertRaises(forms.ValidationError):
@@ -711,8 +711,12 @@ class LocalizedDateTimeTests(SimpleTestCase):
 
         # Parse a date in a valid format, get a parsed result
         result = f.clean('13.30.05 12.21.2010')
-        self.assertEqual(result, datetime(2010, 12, 21, 13, 30, 5))
-
+        self.assertEqual(datetime(2010, 12, 21, 13, 30, 5), result)
+        # ISO format is always valid.
+        self.assertEqual(
+            f.clean('2010-12-21 13:30:05'),
+            datetime(2010, 12, 21, 13, 30, 5),
+        )
         # The parsed result does a round trip to the same format
         text = f.widget.format_value(result)
         self.assertEqual(text, "21.12.2010 13:30:05")
@@ -733,7 +737,7 @@ class CustomDateTimeInputFormatsTests(SimpleTestCase):
         f = forms.DateTimeField()
         # Parse a date in an unaccepted format; get an error
         with self.assertRaises(forms.ValidationError):
-            f.clean('2010-12-21 13:30:05')
+            f.clean('2010/12/21 13:30:05')
 
         # Parse a date in a valid format, get a parsed result
         result = f.clean('1:30:05 PM 21/12/2010')
@@ -756,7 +760,7 @@ class CustomDateTimeInputFormatsTests(SimpleTestCase):
         f = forms.DateTimeField(localize=True)
         # Parse a date in an unaccepted format; get an error
         with self.assertRaises(forms.ValidationError):
-            f.clean('2010-12-21 13:30:05')
+            f.clean('2010/12/21 13:30:05')
 
         # Parse a date in a valid format, get a parsed result
         result = f.clean('1:30:05 PM 21/12/2010')
@@ -781,7 +785,7 @@ class CustomDateTimeInputFormatsTests(SimpleTestCase):
         with self.assertRaises(forms.ValidationError):
             f.clean('13:30:05 21.12.2010')
         with self.assertRaises(forms.ValidationError):
-            f.clean('2010-12-21 13:30:05')
+            f.clean('2010/12/21 13:30:05')
 
         # Parse a date in a valid format, get a parsed result
         result = f.clean('12.21.2010 13:30:05')
@@ -806,7 +810,7 @@ class CustomDateTimeInputFormatsTests(SimpleTestCase):
         with self.assertRaises(forms.ValidationError):
             f.clean('13:30:05 21.12.2010')
         with self.assertRaises(forms.ValidationError):
-            f.clean('2010-12-21 13:30:05')
+            f.clean('2010/12/21 13:30:05')
 
         # Parse a date in a valid format, get a parsed result
         result = f.clean('12.21.2010 13:30:05')
@@ -877,7 +881,7 @@ class SimpleDateTimeFormatTests(SimpleTestCase):
         f = forms.DateTimeField(input_formats=["%I:%M:%S %p %d.%m.%Y", "%I:%M %p %d-%m-%Y"])
         # Parse a date in an unaccepted format; get an error
         with self.assertRaises(forms.ValidationError):
-            f.clean('2010-12-21 13:30:05')
+            f.clean('2010/12/21 13:30:05')
 
         # Parse a date in a valid format, get a parsed result
         result = f.clean('1:30:05 PM 21.12.2010')
@@ -900,7 +904,7 @@ class SimpleDateTimeFormatTests(SimpleTestCase):
         f = forms.DateTimeField(input_formats=["%I:%M:%S %p %d.%m.%Y", "%I:%M %p %d-%m-%Y"], localize=True)
         # Parse a date in an unaccepted format; get an error
         with self.assertRaises(forms.ValidationError):
-            f.clean('2010-12-21 13:30:05')
+            f.clean('2010/12/21 13:30:05')
 
         # Parse a date in a valid format, get a parsed result
         result = f.clean('1:30:05 PM 21.12.2010')