From 12a202c2b22172121284c5dfd068e93d7e5a236e Mon Sep 17 00:00:00 2001
From: Michel <michel@mj91.fr>
Date: Wed, 7 May 2025 09:41:52 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9solution=20des=20conflits=20Git=20et=20n?=
 =?UTF-8?q?ettoyage=20du=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/Gestion sondes.iml | 2 +-
 .idea/misc.xml           | 2 +-
 Cuisine_meudon.py        | 4 ++--
 Cuisine_saclay.py        | 4 ++--
 Monitor.py               | 1 +
 domo91.py                | 9 ++++-----
 requirements.txt         | 1 +
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.idea/Gestion sondes.iml b/.idea/Gestion sondes.iml
index 2c80e12..b6731d8 100644
--- a/.idea/Gestion sondes.iml	
+++ b/.idea/Gestion sondes.iml	
@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.13" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ae1cb4c..f75f9dc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.11 (Gestion sondes) (2)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (Gestion sondes) (2)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13" project-jdk-type="Python SDK" />
   <component name="PyPackaging">
     <option name="earlyReleasesAsUpgrades" value="true" />
   </component>
diff --git a/Cuisine_meudon.py b/Cuisine_meudon.py
index 9b26b4a..d204c65 100644
--- a/Cuisine_meudon.py
+++ b/Cuisine_meudon.py
@@ -64,5 +64,5 @@ try:
     client.subscribe("Meudon/#")
     logging.info("Connexion MQTT réussie et abonnement au topic 'Meudon/#'.")
     client.loop_forever()
-except Exception as e:
-    logging.error(f"Erreur MQTT : {e}")
+except Exception as err:
+    logging.error(f"Erreur MQTT : {err}")
diff --git a/Cuisine_saclay.py b/Cuisine_saclay.py
index 20cdbb8..b726f56 100644
--- a/Cuisine_saclay.py
+++ b/Cuisine_saclay.py
@@ -64,5 +64,5 @@ try:
     client.subscribe("Saclay/#")
     logging.info("Connexion MQTT réussie et abonnement au topic 'Saclay/#'.")
     client.loop_forever()
-except Exception as e:
-    logging.error(f"Erreur MQTT : {e}")
+except Exception as err:
+    logging.error(f"Erreur MQTT : {err}")
diff --git a/Monitor.py b/Monitor.py
index 20777de..c27022d 100644
--- a/Monitor.py
+++ b/Monitor.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import mysql.connector
 from datetime import datetime, timedelta
 import time
diff --git a/domo91.py b/domo91.py
index d2b70aa..6dec4ee 100644
--- a/domo91.py
+++ b/domo91.py
@@ -533,11 +533,10 @@ if st.session_state["authenticated"]:
         except Exception as e:
             st.error(f"Erreur chargement des connexions : {e}")
 
-<<<<<<< HEAD
-        except Exception as err:  # petit bug dans ton except ici (tu avais écrit "except exception")
+
+        except Exception as err:
             st.error(f"Erreur MySQL : {err}")
 
-=======
-        except exception as err:
+        except Exception as err:
             st.error(f"Erreur MySQL : {err}")
->>>>>>> product
+
diff --git a/requirements.txt b/requirements.txt
index 34281c8..54e6601 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,4 @@ paho-mqtt~=2.1.0
 requests~=2.32.3
 schedule~=1.2.2
 paramiko~=3.5.1
+dotenv