@@ -1923,9 +1923,7 @@ async def async_step_wizard_pricing_distribution(
19231923 old_weekend_same = self ._wizard_data .get (
19241924 "tariff_weekend_same_as_weekday" , True
19251925 )
1926- new_weekend_same = user_input .get (
1927- "tariff_weekend_same_as_weekday" , True
1928- )
1926+ new_weekend_same = user_input .get ("tariff_weekend_same_as_weekday" , True )
19291927 if new_tariff_count == "dual" and old_weekend_same != new_weekend_same :
19301928 self ._wizard_data .update (user_input )
19311929 return self .async_show_form (
@@ -1958,9 +1956,7 @@ async def async_step_wizard_pricing_distribution(
19581956 if not is_valid :
19591957 errors ["tariff_vt_start_weekday" ] = error_key
19601958
1961- weekend_same = user_input .get (
1962- "tariff_weekend_same_as_weekday" , True
1963- )
1959+ weekend_same = user_input .get ("tariff_weekend_same_as_weekday" , True )
19641960 if not weekend_same :
19651961 vt_weekend = user_input .get ("tariff_vt_start_weekend" , "" )
19661962 nt_weekend = user_input .get ("tariff_nt_start_weekend" , "0" )
@@ -2009,21 +2005,19 @@ def _get_pricing_distribution_schema(
20092005 tariff_count = defaults .get ("tariff_count" , "single" )
20102006 weekday_vt_default = defaults .get ("tariff_vt_start_weekday" , "6" )
20112007 weekday_nt_default = defaults .get ("tariff_nt_start_weekday" , "22,2" )
2012- weekend_vt_default = defaults .get (
2013- "tariff_vt_start_weekend" , weekday_vt_default
2014- )
2015- weekend_nt_default = defaults .get (
2016- "tariff_nt_start_weekend" , weekday_nt_default
2017- )
2008+ weekend_vt_default = defaults .get ("tariff_vt_start_weekend" , weekday_vt_default )
2009+ weekend_nt_default = defaults .get ("tariff_nt_start_weekend" , weekday_nt_default )
20182010 weekend_same_default = defaults .get ("tariff_weekend_same_as_weekday" )
20192011 if weekend_same_default is None :
2020- if "tariff_vt_start_weekend" not in defaults and "tariff_nt_start_weekend" not in defaults :
2012+ if (
2013+ "tariff_vt_start_weekend" not in defaults
2014+ and "tariff_nt_start_weekend" not in defaults
2015+ ):
20212016 weekend_same_default = True
20222017 else :
2023- weekend_same_default = (
2024- str (weekend_vt_default ) == str (weekday_vt_default )
2025- and str (weekend_nt_default ) == str (weekday_nt_default )
2026- )
2018+ weekend_same_default = str (weekend_vt_default ) == str (
2019+ weekday_vt_default
2020+ ) and str (weekend_nt_default ) == str (weekday_nt_default )
20272021
20282022 schema_fields = {
20292023 vol .Optional ("tariff_count" , default = tariff_count ): vol .In (
0 commit comments