From fac31af880adf784671e1e9504fe7b75c503c82d Mon Sep 17 00:00:00 2001
From: oncleben31 <oncleben31@users.noreply.github.com>
Date: Thu, 1 Aug 2019 07:45:29 +0000
Subject: [PATCH 1/2] Improve log error messages

---
 .../components/meteo_france/__init__.py        | 14 +++++++++++---
 .../components/meteo_france/sensor.py          | 18 ++++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/meteo_france/__init__.py b/homeassistant/components/meteo_france/__init__.py
index d227a7fe47cc9..ab3ec45867b20 100644
--- a/homeassistant/components/meteo_france/__init__.py
+++ b/homeassistant/components/meteo_france/__init__.py
@@ -113,13 +113,17 @@ def setup(hass, config):
     # If weather alert monitoring is expected initiate a client to be used by
     # all weather_alert entities.
     if need_weather_alert_watcher:
+        _LOGGER.debug("Weather Alert monitoring expected. Loading vigilancemeteo")
         from vigilancemeteo import VigilanceMeteoFranceProxy, VigilanceMeteoError
 
         weather_alert_client = VigilanceMeteoFranceProxy()
         try:
             weather_alert_client.update_data()
         except VigilanceMeteoError as exp:
-            _LOGGER.error(exp)
+            _LOGGER.error(
+                "Unexpected error when creating the" "vigilance_meteoFrance proxy: %s ",
+                exp,
+            )
     else:
         weather_alert_client = None
     hass.data[DATA_METEO_FRANCE]["weather_alert_client"] = weather_alert_client
@@ -133,7 +137,9 @@ def setup(hass, config):
         try:
             client = meteofranceClient(city)
         except meteofranceError as exp:
-            _LOGGER.error(exp)
+            _LOGGER.error(
+                "Unexpected error when creating the meteofrance proxy: %s", exp
+            )
             return
 
         client.need_rain_forecast = bool(
@@ -179,4 +185,6 @@ def update(self):
         try:
             self._client.update()
         except meteofranceError as exp:
-            _LOGGER.error(exp)
+            _LOGGER.error(
+                "Unexpected error when updating the meteofrance proxy: %s", exp
+            )
diff --git a/homeassistant/components/meteo_france/sensor.py b/homeassistant/components/meteo_france/sensor.py
index 9ee9ce9cef6bb..9e5ed24592ab1 100644
--- a/homeassistant/components/meteo_france/sensor.py
+++ b/homeassistant/components/meteo_france/sensor.py
@@ -35,18 +35,23 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                     datas["dept"], weather_alert_client
                 )
             except ValueError as exp:
-                _LOGGER.error(exp)
+                _LOGGER.error(
+                    "Unexpected error when creating the weather"
+                    "alert sensor for %s in department %s: %s",
+                    city,
+                    datas["dept"],
+                    exp,
+                )
                 alert_watcher = None
             else:
                 _LOGGER.info(
-                    "weather alert watcher added for %s" "in department %s",
+                    "Weather alert watcher added for %s" "in department %s",
                     city,
                     datas["dept"],
                 )
         else:
             _LOGGER.warning(
-                "No dept key found for '%s'. So weather alert "
-                "information won't be available",
+                "No 'dept' key found for '%s'. So weather alert information won't be available",
                 city,
             )
             # Exit and don't create the sensor if no department code available.
@@ -77,6 +82,11 @@ def name(self):
         """Return the name of the sensor."""
         return "{} {}".format(self._data["name"], SENSOR_TYPES[self._condition][0])
 
+    @property
+    def unique_id(self):
+        """Return a unique, HASS-friendly identifier for this entity."""
+        return "{0}_{1}".format(self._data["name"], SENSOR_TYPES[self._condition][0])
+
     @property
     def state(self):
         """Return the state of the sensor."""

From 111f81b48788653e79ffca74b3a4cf3e06b46604 Mon Sep 17 00:00:00 2001
From: oncleben31 <oncleben31@users.noreply.github.com>
Date: Thu, 1 Aug 2019 08:56:09 +0000
Subject: [PATCH 2/2] remove unique_id not ready yet

---
 homeassistant/components/meteo_france/sensor.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/homeassistant/components/meteo_france/sensor.py b/homeassistant/components/meteo_france/sensor.py
index 9e5ed24592ab1..95113a60cd38e 100644
--- a/homeassistant/components/meteo_france/sensor.py
+++ b/homeassistant/components/meteo_france/sensor.py
@@ -36,8 +36,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                 )
             except ValueError as exp:
                 _LOGGER.error(
-                    "Unexpected error when creating the weather"
-                    "alert sensor for %s in department %s: %s",
+                    "Unexpected error when creating the weather alert sensor for %s in department %s: %s",
                     city,
                     datas["dept"],
                     exp,
@@ -82,11 +81,6 @@ def name(self):
         """Return the name of the sensor."""
         return "{} {}".format(self._data["name"], SENSOR_TYPES[self._condition][0])
 
-    @property
-    def unique_id(self):
-        """Return a unique, HASS-friendly identifier for this entity."""
-        return "{0}_{1}".format(self._data["name"], SENSOR_TYPES[self._condition][0])
-
     @property
     def state(self):
         """Return the state of the sensor."""