From 23187f0c4136d7d4a9ec3852d46a9e038852de37 Mon Sep 17 00:00:00 2001 From: Axel-CH Date: Mon, 17 Mar 2025 17:52:29 -0400 Subject: [PATCH] chore: simplify error handling in _rpc_list_custom_data --- freqtrade/rpc/rpc.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index f9c30d916..e4ec1a6b5 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -1167,16 +1167,15 @@ class RPC: ] results.append({"trade_id": trade.id, "custom_data": formatted_custom_data}) - # Handle case when there is no custom data found across trades. - if not results: - message_details = "found for any open trades." - if key and trade_id: - message_details = f"with key '{key}' found for Trade ID: {trade_id}." - elif trade_id: - message_details = f"found for Trade ID: {trade_id}." - elif key: - message_details = f"with key '{key}' found for any open trades." - raise RPCException(f"No custom-data {message_details}") + # Handle case when there is no custom data found across trades. + if not results: + message_details = "" + if key: + message_details += f"with key '{key}' " + message_details += ( + f"found for Trade ID: {trade_id}." if trade_id else "found for any open trades." + ) + raise RPCException(f"No custom-data {message_details}") return results