Scale back warnings.warn and add stacklevels= where appropriate.

[python_utils.git] / camera_utils.py

diff --git a/camera_utils.py b/camera_utils.py
index e69eddb7b3cec5faf915dd6bc23243b261d26858..83664fdc1bad65cb5e9ee4f70de4161df4fad832 100644 (file)
--- a/camera_utils.py
+++ b/camera_utils.py
@@ -84,7 +84,7 @@ def fetch_camera_image_from_video_server(
         logger.exception(e)
     msg = f"Got a bad image or HTTP error from {url}; returning None."
     logger.warning(msg)
-    warnings.warn(msg)
+    warnings.warn(msg, stacklevel=2)
     return None
 
 
@@ -135,8 +135,8 @@ def fetch_camera_image_from_rtsp_stream(
     except Exception as e:
         logger.exception(e)
     msg = "Failed to retrieve image via RTSP {stream}, returning None."
-    warnings.warn(msg)
     logger.warning(msg)
+    warnings.warn(msg, stacklevel=2)
     return None
 
 
@@ -165,7 +165,7 @@ def _fetch_camera_image(
         )
     msg = "Failed to retieve image from both video server and direct RTSP stream"
     logger.warning(msg)
-    warnings.warn(msg)
+    warnings.warn(msg, stacklevel=2)
     return RawJpgHsv(None, None, None)