Raise validation error on invalid timezone parsing.

tomchristie · tomchristie · commit bf7fcc495b36 · 2017-07-10T10:14:31.000+01:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1137,18 +1137,16 @@ def to_internal_value(self, value):
             if input_format.lower() == ISO_8601:
                 try:
                     parsed = parse_datetime(value)
-                except (ValueError, TypeError):
-                    pass
-                else:
                     if parsed is not None:
                         return self.enforce_timezone(parsed)
+                except (ValueError, TypeError):
+                    pass
             else:
                 try:
                     parsed = self.datetime_parser(value, input_format)
+                    return self.enforce_timezone(parsed)
                 except (ValueError, TypeError):
                     pass
-                else:
-                    return self.enforce_timezone(parsed)
 
         humanized_format = humanize_datetime.datetime_formats(input_formats)
         self.fail('invalid', format=humanized_format)
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -1152,6 +1152,7 @@ class TestDateTimeField(FieldValues):
     invalid_inputs = {
         'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z].'],
         '2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z].'],
+        '2018-08-16 22:00-24:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z].'],
         datetime.date(2001, 1, 1): ['Expected a datetime but got a date.'],
     }
     outputs = {

Original file line number	Diff line number	Diff line change
`@@ -1152,6 +1152,7 @@ class TestDateTimeField(FieldValues):`
`1152`	`1152`	`invalid_inputs = {`
`1153`	`1153`	`'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM\|-HH:MM\|Z].'],`
`1154`	`1154`	`'2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM\|-HH:MM\|Z].'],`
	`1155`	`+ '2018-08-16 22:00-24:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM\|-HH:MM\|Z].'],`
`1155`	`1156`	`datetime.date(2001, 1, 1): ['Expected a datetime but got a date.'],`
`1156`	`1157`	`}`
`1157`	`1158`	`outputs = {`