Refactor config flow type hints and ensure JSON files end with a newline

Author: iantrich

custom_components/feedparser/config_flow.py

@@ -4,13 +4,14 @@
 
 from collections.abc import Mapping
 from datetime import timedelta
-from typing import Any
+from typing import Any, cast
 
 import requests
 import voluptuous as vol
 from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
+    FlowResult,
     OptionsFlow,
 )
 from homeassistant.const import CONF_NAME
@@ -173,7 +174,7 @@ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
     async def async_step_user(
         self,
         user_input: Mapping[str, object] | None = None,
-    ) -> object:
+    ) -> FlowResult:
         """Handle the initial step."""
         errors: dict[str, str] = {}
 
@@ -220,20 +221,26 @@ async def async_step_user(
                                 str(user_input[CONF_EXCLUSIONS]).strip(),
                             ),
                         }
-                        return self.async_create_entry(
-                            title=data[CONF_NAME],
-                            data=data,
-                            options=options,
+                        return cast(
+                            "FlowResult",
+                            self.async_create_entry(
+                                title=data[CONF_NAME],
+                                data=data,
+                                options=options,
+                            ),
                         )
 
         data_schema = _schema_with_defaults(
             include_feed_identity=True,
         )
 
-        return self.async_show_form(
-            step_id="user",
-            data_schema=data_schema,
-            errors=errors,
+        return cast(
+            "FlowResult",
+            self.async_show_form(
+                step_id="user",
+                data_schema=data_schema,
+                errors=errors,
+            ),
         )
 
     @staticmethod
@@ -257,7 +264,7 @@ def __init__(self, config_entry: ConfigEntry) -> None:
     async def async_step_init(
         self,
         user_input: Mapping[str, object] | None = None,
-    ) -> object:
+    ) -> FlowResult:
         """Manage Feedparser options."""
         if user_input is not None:
             options = {
@@ -269,7 +276,7 @@ async def async_step_init(
                 CONF_INCLUSIONS: _split_csv(str(user_input[CONF_INCLUSIONS]).strip()),
                 CONF_EXCLUSIONS: _split_csv(str(user_input[CONF_EXCLUSIONS]).strip()),
             }
-            return self.async_create_entry(title="", data=options)
+            return cast("FlowResult", self.async_create_entry(title="", data=options))
 
         merged = {**self._config_entry.data, **self._config_entry.options}
         data_schema = _schema_with_defaults(
@@ -289,4 +296,7 @@ async def async_step_init(
             inclusions=_join_csv(merged.get(CONF_INCLUSIONS, [])),
             exclusions=_join_csv(merged.get(CONF_EXCLUSIONS, [])),
         )
-        return self.async_show_form(step_id="init", data_schema=data_schema)
+        return cast(
+            "FlowResult",
+            self.async_show_form(step_id="init", data_schema=data_schema),
+        )

tests/data/CTK.json

@@ -10,4 +10,4 @@
         }
     },
     "download_date": "2024-02-23T21:08:09.183484+00:00"
-}
+}

tests/data/alle_meldungen.json

@@ -16,4 +16,4 @@
         "remove_summary_image": true
     },
     "download_date": "2024-02-23T21:08:09.183484+00:00"
-}
+}

tests/data/anp_nieuws.json

@@ -14,4 +14,4 @@
         ]
     },
     "download_date": "2024-02-23T21:08:09.183484+00:00"
-}
+}

tests/data/api_met_no_metalerts.json

@@ -12,4 +12,4 @@
         ]
     },
     "download_date": "2024-02-23T21:08:09.183484+00:00"
-}
+}

tests/data/bbc_europe.json

@@ -9,4 +9,4 @@
         "date_format": "%a, %d %b %Y %H:%M:%S %z"
     },
     "download_date": "2024-02-25T21:09:08.348208+00:00"
-}
+}

tests/data/buienradar_nl.json

@@ -9,4 +9,4 @@
         "date_format": "%Y-%m-%d %H:%M:%S.%f"
     },
     "download_date": "2024-02-23T21:08:09.183484+00:00"
-}
+}

tests/data/ct24.json

@@ -5,4 +5,4 @@
         "feed_url": "https://ct24.ceskatelevize.cz/rss/hlavni-zpravy"
     },
     "download_date": "2023-07-30T13:48:50.563494"
-}
+}

tests/data/nu_nl.json

@@ -5,4 +5,4 @@
         "feed_url": "https://www.nu.nl/rss"
     },
     "download_date": "2023-07-30T13:48:50.563494"
-}
+}

tests/data/nu_nl_algemeen.json

@@ -5,4 +5,4 @@
         "feed_url": "https://www.nu.nl/rss/Algemeen"
     },
     "download_date": "2023-07-30T13:48:50.563494"
-}
+}