From dba6330fc8e097517dc3b9e753d48b418abc5dc5 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Mon, 31 Jul 2023 17:25:57 +0200
Subject: [PATCH] Update pydiscovergy to 2.0.3 (#97509)

* Update pydiscovergy to 2.0.3

* Fix mypy

* Fix tests
---
 homeassistant/components/discovergy/coordinator.py | 4 ++--
 homeassistant/components/discovergy/diagnostics.py | 5 +++--
 homeassistant/components/discovergy/manifest.json  | 2 +-
 requirements_all.txt                               | 2 +-
 requirements_test_all.txt                          | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/discovergy/coordinator.py b/homeassistant/components/discovergy/coordinator.py
index 6ee5a4c3e84..d2548d0bacd 100644
--- a/homeassistant/components/discovergy/coordinator.py
+++ b/homeassistant/components/discovergy/coordinator.py
@@ -50,9 +50,9 @@ class DiscovergyUpdateCoordinator(DataUpdateCoordinator[Reading]):
             return await self.discovergy_client.meter_last_reading(self.meter.meter_id)
         except AccessTokenExpired as err:
             raise ConfigEntryAuthFailed(
-                f"Auth expired while fetching last reading for meter {self.meter.get_meter_id()}"
+                f"Auth expired while fetching last reading for meter {self.meter.meter_id}"
             ) from err
         except HTTPError as err:
             raise UpdateFailed(
-                f"Error while fetching last reading for meter {self.meter.get_meter_id()}"
+                f"Error while fetching last reading for meter {self.meter.meter_id}"
             ) from err
diff --git a/homeassistant/components/discovergy/diagnostics.py b/homeassistant/components/discovergy/diagnostics.py
index a7c79bf3b13..5d4a34b07dd 100644
--- a/homeassistant/components/discovergy/diagnostics.py
+++ b/homeassistant/components/discovergy/diagnostics.py
@@ -1,6 +1,7 @@
 """Diagnostics support for discovergy."""
 from __future__ import annotations
 
+from dataclasses import asdict
 from typing import Any
 
 from pydiscovergy.models import Meter
@@ -36,11 +37,11 @@ async def async_get_config_entry_diagnostics(
 
     for meter in meters:
         # make a dict of meter data and redact some data
-        flattened_meter.append(async_redact_data(meter.__dict__, TO_REDACT_METER))
+        flattened_meter.append(async_redact_data(asdict(meter), TO_REDACT_METER))
 
         # get last reading for meter and make a dict of it
         coordinator = data.coordinators[meter.meter_id]
-        last_readings[meter.meter_id] = coordinator.data.__dict__
+        last_readings[meter.meter_id] = asdict(coordinator.data)
 
     return {
         "entry": async_redact_data(entry.as_dict(), TO_REDACT_CONFIG_ENTRY),
diff --git a/homeassistant/components/discovergy/manifest.json b/homeassistant/components/discovergy/manifest.json
index 23d7f1ad5bf..d5bdc018eda 100644
--- a/homeassistant/components/discovergy/manifest.json
+++ b/homeassistant/components/discovergy/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/discovergy",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
-  "requirements": ["pydiscovergy==2.0.1"]
+  "requirements": ["pydiscovergy==2.0.3"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 8a1a8ef3024..9d69d8b1f64 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1638,7 +1638,7 @@ pydelijn==1.1.0
 pydexcom==0.2.3
 
 # homeassistant.components.discovergy
-pydiscovergy==2.0.1
+pydiscovergy==2.0.3
 
 # homeassistant.components.doods
 pydoods==1.0.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 532c02b66a6..4d91f9b13ce 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1217,7 +1217,7 @@ pydeconz==113
 pydexcom==0.2.3
 
 # homeassistant.components.discovergy
-pydiscovergy==2.0.1
+pydiscovergy==2.0.3
 
 # homeassistant.components.android_ip_webcam
 pydroid-ipcam==2.0.0