Apply changes suggested by peterthomassen

Author: mgaligniana

rest_framework/renderers.py

@@ -343,10 +343,10 @@ def render_field(self, field, parent_style):
         field = field.as_form_field()
 
         if style.get('input_type') == 'datetime-local':
-            has_format = hasattr(field._field, "format")
-
-            if has_format:
+            if hasattr(field._field, "format"):
                 if field._field.format is None:
+                    # `to_representation` returned a Python datetime object
+                    # https://www.django-rest-framework.org/api-guide/fields/#datetimefield
                     datetime_field_value = field.value
                 else:
                     datetime_field_value = datetime.datetime.strptime(field.value, field._field.format)

tests/test_renderers.py

@@ -495,111 +495,65 @@ class TestDateTimeFieldHTMLFormRender(TestCase):
     Default TIME_ZONE is 'America/Chicago'.
     """
 
-    def test_datetime_field_rendering_milliseconds(self):
+    def _assert_datetime_rendering(self, appointment, expected, datetimefield_kwargs=None):
+        datetimefield_kwargs = datetimefield_kwargs or {}
+
         class TestSerializer(serializers.Serializer):
-            appointment = serializers.DateTimeField()
+            appointment = serializers.DateTimeField(**datetimefield_kwargs)
 
-        appointment = datetime(2024, 12, 24, 0, 55, 30, 345678)
         serializer = TestSerializer(data={"appointment": appointment})
         serializer.is_valid()
         renderer = HTMLFormRenderer()
         field = serializer['appointment']
         rendered = renderer.render_field(field, {})
-        self.assertInHTML(
-            '<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:30.345">',
-            rendered
+        expected_html = (
+            f'<input name="appointment" class="form-control" '
+            f'type="datetime-local" value="{expected}">'
         )
 
-    def test_datetime_field_rendering_no_milliseconds(self):
-        class TestSerializer(serializers.Serializer):
-            appointment = serializers.DateTimeField()
+        self.assertInHTML(expected_html, rendered)
 
-        appointment = datetime(2024, 12, 24, 0, 55, 30, 0)
-        serializer = TestSerializer(data={"appointment": appointment})
-        serializer.is_valid()
-        renderer = HTMLFormRenderer()
-        field = serializer['appointment']
-        rendered = renderer.render_field(field, {})
-        self.assertInHTML(
-            '<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:30.000">',
-            rendered
+    def test_datetime_field_rendering_milliseconds(self):
+        self._assert_datetime_rendering(
+            datetime(2024, 12, 24, 0, 55, 30, 345678), "2024-12-24T00:55:30.345"
         )
 
-    def test_datetime_field_rendering_no_seconds_and_no_milliseconds(self):
-        class TestSerializer(serializers.Serializer):
-            appointment = serializers.DateTimeField()
+    def test_datetime_field_rendering_no_milliseconds(self):
+        self._assert_datetime_rendering(
+            datetime(2024, 12, 24, 0, 55, 30, 0), "2024-12-24T00:55:30.000"
+        )
 
-        appointment = datetime(2024, 12, 24, 0, 55, 0, 0)
-        serializer = TestSerializer(data={"appointment": appointment})
-        serializer.is_valid()
-        renderer = HTMLFormRenderer()
-        field = serializer['appointment']
-        rendered = renderer.render_field(field, {})
-        self.assertInHTML(
-            '<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:00.000">',
-            rendered
+    def test_datetime_field_rendering_no_seconds_and_no_milliseconds(self):
+        self._assert_datetime_rendering(
+            datetime(2024, 12, 24, 0, 55, 0, 0), "2024-12-24T00:55:00.000"
         )
 
     def test_datetime_field_rendering_with_format_as_none(self):
-        class TestSerializer(serializers.Serializer):
-            appointment = serializers.DateTimeField(format=None)
-
-        appointment = datetime(2024, 12, 24, 0, 55, 30, 345678)
-        serializer = TestSerializer(data={"appointment": appointment})
-        serializer.is_valid()
-        renderer = HTMLFormRenderer()
-        field = serializer['appointment']
-        rendered = renderer.render_field(field, {})
-        self.assertInHTML(
-            '<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:30.345">',
-            rendered
+        self._assert_datetime_rendering(
+            datetime(2024, 12, 24, 0, 55, 30, 345678),
+            "2024-12-24T00:55:30.345",
+            {"format": None}
         )
 
     def test_datetime_field_rendering_with_format(self):
-        class TestSerializer(serializers.Serializer):
-            appointment = serializers.DateTimeField(format='%a %d %b %Y, %I:%M%p')
-
-        appointment = datetime(2024, 12, 24, 0, 55, 30, 345678)
-        serializer = TestSerializer(data={"appointment": appointment})
-        serializer.is_valid()
-        renderer = HTMLFormRenderer()
-        field = serializer['appointment']
-        rendered = renderer.render_field(field, {})
-        self.assertInHTML(
-            '<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:00.000">',
-            rendered
+        self._assert_datetime_rendering(
+            datetime(2024, 12, 24, 0, 55, 30, 345678),
+            "2024-12-24T00:55:00.000",
+            {"format": "%a %d %b %Y, %I:%M%p"}
         )
 
     @override_settings(TIME_ZONE='UTC', USE_TZ=True)
     def test_datetime_field_rendering_utc(self):
-        class TestSerializer(serializers.Serializer):
-            appointment = serializers.DateTimeField()
-
-        appointment = datetime(2024, 12, 24, 0, 55, 30, 345678)
-        serializer = TestSerializer(data={"appointment": appointment})
-        serializer.is_valid()
-        renderer = HTMLFormRenderer()
-        field = serializer['appointment']
-        rendered = renderer.render_field(field, {})
-        self.assertInHTML(
-            '<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:30.345">',
-            rendered
+        self._assert_datetime_rendering(
+            datetime(2024, 12, 24, 0, 55, 30, 345678),
+            "2024-12-24T00:55:30.345"
         )
 
     @override_settings(REST_FRAMEWORK={'DATETIME_FORMAT': '%a %d %b %Y, %I:%M%p'})
     def test_datetime_field_rendering_with_custom_datetime_format(self):
-        class TestSerializer(serializers.Serializer):
-            appointment = serializers.DateTimeField()
-
-        appointment = datetime(2024, 12, 24, 0, 55, 30, 345678)
-        serializer = TestSerializer(data={"appointment": appointment})
-        serializer.is_valid()
-        renderer = HTMLFormRenderer()
-        field = serializer['appointment']
-        rendered = renderer.render_field(field, {})
-        self.assertInHTML(
-            '<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:00.000">',
-            rendered
+        self._assert_datetime_rendering(
+            datetime(2024, 12, 24, 0, 55, 30, 345678),
+            "2024-12-24T00:55:00.000"
         )