From 4056f673b83c7cef774e72efee1f4c2f8668ac16 Mon Sep 17 00:00:00 2001
From: Klaas Schoute <klaas_schoute@hotmail.com>
Date: Sun, 6 Nov 2022 14:51:19 +0100
Subject: [PATCH] Fix watermeter issue for old P1 Monitor versions (#81570)

* Bump the python package version

* Add exception to check if user has a water meter
---
 homeassistant/components/p1_monitor/__init__.py   | 5 +++--
 homeassistant/components/p1_monitor/manifest.json | 2 +-
 requirements_all.txt                              | 2 +-
 requirements_test_all.txt                         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/p1_monitor/__init__.py b/homeassistant/components/p1_monitor/__init__.py
index b157f3e8116..e6178ffeb41 100644
--- a/homeassistant/components/p1_monitor/__init__.py
+++ b/homeassistant/components/p1_monitor/__init__.py
@@ -5,6 +5,7 @@ from typing import TypedDict
 
 from p1monitor import (
     P1Monitor,
+    P1MonitorConnectionError,
     P1MonitorNoDataError,
     Phases,
     Settings,
@@ -101,8 +102,8 @@ class P1MonitorDataUpdateCoordinator(DataUpdateCoordinator[P1MonitorData]):
             try:
                 data[SERVICE_WATERMETER] = await self.p1monitor.watermeter()
                 self.has_water_meter = True
-            except P1MonitorNoDataError:
-                LOGGER.debug("No watermeter data received from P1 Monitor")
+            except (P1MonitorNoDataError, P1MonitorConnectionError):
+                LOGGER.debug("No water meter data received from P1 Monitor")
                 if self.has_water_meter is None:
                     self.has_water_meter = False
 
diff --git a/homeassistant/components/p1_monitor/manifest.json b/homeassistant/components/p1_monitor/manifest.json
index 626cff15dfa..2e699276caa 100644
--- a/homeassistant/components/p1_monitor/manifest.json
+++ b/homeassistant/components/p1_monitor/manifest.json
@@ -3,7 +3,7 @@
   "name": "P1 Monitor",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/p1_monitor",
-  "requirements": ["p1monitor==2.1.0"],
+  "requirements": ["p1monitor==2.1.1"],
   "codeowners": ["@klaasnicolaas"],
   "quality_scale": "platinum",
   "iot_class": "local_polling",
diff --git a/requirements_all.txt b/requirements_all.txt
index 4cff3722acc..61246422853 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1256,7 +1256,7 @@ orvibo==1.1.1
 ovoenergy==1.2.0
 
 # homeassistant.components.p1_monitor
-p1monitor==2.1.0
+p1monitor==2.1.1
 
 # homeassistant.components.mqtt
 # homeassistant.components.shiftr
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 94ded26c853..5a7285ced42 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -895,7 +895,7 @@ oralb-ble==0.13.0
 ovoenergy==1.2.0
 
 # homeassistant.components.p1_monitor
-p1monitor==2.1.0
+p1monitor==2.1.1
 
 # homeassistant.components.mqtt
 # homeassistant.components.shiftr