From 0cebae33f817e0a075dcb3f11d9c479cdc50d3dd Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 16 Feb 2023 00:50:34 -0600 Subject: [PATCH] tweak --- .../components/recorder/statistics.py | 59 +++++++------------ 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/homeassistant/components/recorder/statistics.py b/homeassistant/components/recorder/statistics.py index abd8a85992c..85eea4994ef 100644 --- a/homeassistant/components/recorder/statistics.py +++ b/homeassistant/components/recorder/statistics.py @@ -2077,45 +2077,28 @@ def _sorted_statistics_to_dict( convert = _get_statistic_to_display_unit_converter(unit, state_unit, units) else: convert = None + args = ( + ent_results, + stats_list, + table_duration_seconds, + _want_last_reset, + _want_mean, + _want_min, + _want_max, + _want_state, + _want_sum, + start_ts_idx, + last_reset_ts_idx, + mean_idx, + min_idx, + max_idx, + state_idx, + sum_idx, + ) if convert: - _build_converted_statistic_entries( - ent_results, - stats_list, - convert, - table_duration_seconds, - _want_last_reset, - _want_mean, - _want_min, - _want_max, - _want_state, - _want_sum, - start_ts_idx, - last_reset_ts_idx, - mean_idx, - min_idx, - max_idx, - state_idx, - sum_idx, - ) + _build_converted_statistic_entries(convert, *args) else: - _build_raw_statistic_entries( - ent_results, - stats_list, - table_duration_seconds, - _want_last_reset, - _want_mean, - _want_min, - _want_max, - _want_state, - _want_sum, - start_ts_idx, - last_reset_ts_idx, - mean_idx, - min_idx, - max_idx, - state_idx, - sum_idx, - ) + _build_raw_statistic_entries(*args) return result @@ -2160,9 +2143,9 @@ def _build_raw_statistic_entries( def _build_converted_statistic_entries( + convert: Callable[[Any], Any], ent_results: list[dict[str, Any]], stats_list: list[Row], - convert: Callable[[Any], Any], table_duration_seconds: float, _want_last_reset: bool, _want_mean: bool,