Apply changes suggested by peterthomassen

Author: mgaligniana

rest_framework/renderers.py

@@ -344,25 +344,22 @@ def render_field(self, field, parent_style):
 
         if style.get('input_type') == 'datetime-local':
             try:
-                format = field._field.format
+                format_ = field._field.format
             except AttributeError:
-                format = api_settings.DATETIME_FORMAT
+                format_ = api_settings.DATETIME_FORMAT
 
-            if format is None:
-                # field.value is a datetime
-                # https://www.django-rest-framework.org/api-guide/fields/#datetimefield
-                datetime_field_value = field.value
-            else:
+            if format_ is not None:
                 # field.value is expected to be a string
-                datetime_field_value = (
-                    datetime.datetime.fromisoformat(field.value.rstrip('Z')) if format == ISO_8601
-                    else datetime.datetime.strptime(field.value, format)
+                # https://www.django-rest-framework.org/api-guide/fields/#datetimefield
+                field.value = (
+                    datetime.datetime.fromisoformat(field.value.rstrip('Z')) if format_ == ISO_8601
+                    else datetime.datetime.strptime(field.value, format_)
                 )
 
             # The format of an input type="datetime-local" is "yyyy-MM-ddThh:mm"
             # followed by optional ":ss" or ":ss.SSS", so keep only the first three
             # digits of milliseconds to avoid browser console error.
-            field.value = datetime_field_value.replace(tzinfo=None).isoformat(timespec="milliseconds")
+            field.value = field.value.replace(tzinfo=None).isoformat(timespec="milliseconds")
 
         if 'template' in style:
             template_name = style['template']

tests/test_renderers.py

@@ -507,7 +507,7 @@ class TestSerializer(serializers.Serializer):
         field = serializer['appointment']
         rendered = renderer.render_field(field, {})
         expected_html = (
-            f'<input name="appointment" class="form-control" '
+            '<input name="appointment" class="form-control" '
             f'type="datetime-local" value="{expected}">'
         )
 
@@ -518,11 +518,6 @@ def test_datetime_field_rendering_milliseconds(self):
             datetime(2024, 12, 24, 0, 55, 30, 345678), "2024-12-24T00:55:30.345"
         )
 
-    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"
-        )
-
     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"
@@ -542,13 +537,20 @@ def test_datetime_field_rendering_with_format(self):
             {"format": "%a %d %b %Y, %I:%M%p"}
         )
 
-    @override_settings(TIME_ZONE='UTC', USE_TZ=True)
+    @override_settings(TIME_ZONE='UTC')
     def test_datetime_field_rendering_utc(self):
         self._assert_datetime_rendering(
             datetime(2024, 12, 24, 0, 55, 30, 345678),
             "2024-12-24T00:55:30.345"
         )
 
+    @override_settings(TIME_ZONE='Asia/Tokyo')  # +09:00
+    def test_datetime_field_rendering_non_zero_timezone(self):
+        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):
         self._assert_datetime_rendering(