@@ -126,9 +126,8 @@ def _resolve_help_option_sort_value(
126126
127127 layout = self .parser .help_layout
128128 if layout is not None :
129- layout_default = getattr (layout , "help_option_sort_default" , None )
130129 layout_rules = resolve_help_option_sort_rules (
131- layout_default ,
130+ layout . help_option_sort_default ,
132131 value_name = f"{ layout .__class__ .__name__ } .help_option_sort_default" ,
133132 )
134133 if layout_rules :
@@ -148,9 +147,8 @@ def _resolve_help_subcommand_sort_value(
148147
149148 layout = self .parser .help_layout
150149 if layout is not None :
151- layout_default = getattr (layout , "help_subcommand_sort_default" , None )
152150 layout_rules = resolve_help_subcommand_sort_rules (
153- layout_default ,
151+ layout . help_subcommand_sort_default ,
154152 value_name = f"{ layout .__class__ .__name__ } .help_subcommand_sort_default" ,
155153 )
156154 if layout_rules :
@@ -160,19 +158,19 @@ def _resolve_help_subcommand_sort_value(
160158
161159 def _base_build_settings (self ) -> _CommandBuildSettings :
162160 help_option_sort = self ._resolve_help_option_sort_value (
163- getattr ( self .parser , " help_option_sort" , None ) ,
161+ self .parser . help_option_sort ,
164162 value_name = "help_option_sort" ,
165163 )
166164 help_subcommand_sort = self ._resolve_help_subcommand_sort_value (
167- getattr ( self .parser , " help_subcommand_sort" , None ) ,
165+ self .parser . help_subcommand_sort ,
168166 value_name = "help_subcommand_sort" ,
169167 )
170168 return _CommandBuildSettings (
171- include_inherited_methods = getattr ( self .parser , " include_inherited_methods" , False ) ,
172- include_classmethods = getattr ( self .parser , " include_classmethods" , False ) ,
173- expand_model_params = getattr ( self .parser , " expand_model_params" , True ) ,
174- model_expansion_max_depth = getattr ( self .parser , " model_expansion_max_depth" , 3 ) ,
175- abbreviation_scope = getattr ( self .parser , " abbreviation_scope" , "top_level_options" ) ,
169+ include_inherited_methods = self .parser . include_inherited_methods ,
170+ include_classmethods = self .parser . include_classmethods ,
171+ expand_model_params = self .parser . expand_model_params ,
172+ model_expansion_max_depth = self .parser . model_expansion_max_depth ,
173+ abbreviation_scope = self .parser . abbreviation_scope ,
176174 help_option_sort = help_option_sort ,
177175 help_subcommand_sort = help_subcommand_sort ,
178176 )
@@ -858,7 +856,7 @@ def _argument_from_parameter(
858856 has_default = param .has_default ,
859857 default = param .default if param .has_default else None ,
860858 is_required = param .is_required ,
861- is_optional = getattr ( param , " is_optional" , False ) ,
859+ is_optional = param . is_optional ,
862860 kind = param .kind ,
863861 description = param .description ,
864862 )
0 commit comments