Remove {} from forecast

bieniu · Jul 6, 2020 · 2b4559c · 2b4559c
1 parent 3a422c9
commit 2b4559c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/accuweather/__init__.py b/accuweather/__init__.py
@@ -89,14 +89,12 @@ def _clean_current_condition(data: dict, to_remove: tuple) -> dict:
     @staticmethod
     def _parse_forecast(data: list, to_remove: tuple) -> list:
         """Parse and clean forecast API response."""
-        data = {
-            "DailyForecasts": [
-                {key: value for key, value in item.items() if key not in to_remove}
-                for item in data["DailyForecasts"]
-            ]
-        }
-
-        for day in data["DailyForecasts"]:
+        data = [
+            {key: value for key, value in item.items() if key not in to_remove}
+            for item in data["DailyForecasts"]
+        ]
+
+        for day in data:
             for item in day["AirAndPollen"]:
                 day[item["Name"]] = item
                 day[item["Name"]].pop("Name")

diff --git a/tests/test_base.py b/tests/test_base.py
@@ -74,13 +74,13 @@ async def test_get_forecast():
             )
             forecast = await accuweather.async_get_forecast()
 
-        assert forecast["DailyForecasts"][0]["IconDay"] == 15
-        assert forecast["DailyForecasts"][0]["PrecipitationProbabilityDay"] == 57
-        assert forecast["DailyForecasts"][0]["WindDay"]["Speed"]["Value"] == 13.0
-        assert forecast["DailyForecasts"][0]["TemperatureMax"]["Value"] == 24.8
-        assert forecast["DailyForecasts"][0]["TemperatureMax"]["Unit"] == "C"
-        assert forecast["DailyForecasts"][0]["AirQuality"]["Value"] == 23
-        assert forecast["DailyForecasts"][0]["AirQuality"]["Type"] == "Ozone"
+        assert forecast[0]["IconDay"] == 15
+        assert forecast[0]["PrecipitationProbabilityDay"] == 57
+        assert forecast[0]["WindDay"]["Speed"]["Value"] == 13.0
+        assert forecast[0]["TemperatureMax"]["Value"] == 24.8
+        assert forecast[0]["TemperatureMax"]["Unit"] == "C"
+        assert forecast[0]["AirQuality"]["Value"] == 23
+        assert forecast[0]["AirQuality"]["Type"] == "Ozone"
 
 
 @pytest.mark.asyncio