@@ -107,17 +107,17 @@ def do_pos_and_flag(self, args: argparse.Namespace) -> None:
107107 TUPLE_METAVAR = ('arg1' , 'others' )
108108 CUSTOM_DESC_HEADER = "Custom Header"
109109
110- # lists used in our tests (there is a mix of sorted and unsorted on purpose)
111- non_negative_num_choices = [ 1 , 2 , 3 , 0.5 , 22 ]
112- num_choices = [ - 1 , 1 , - 2 , 2.5 , 0 , - 12 ]
113- static_choices_list = [ 'static' , 'choices' , 'stop' , 'here' ]
114- choices_from_provider = [ 'choices' , 'provider' , 'probably' , 'improved' ]
115- completion_item_choices = [ CompletionItem ('choice_1' , 'A description' ), CompletionItem ('choice_2' , 'Another description' )]
110+ # tuples (for sake of immutability) used in our tests (there is a mix of sorted and unsorted on purpose)
111+ non_negative_num_choices = ( 1 , 2 , 3 , 0.5 , 22 )
112+ num_choices = ( - 1 , 1 , - 2 , 2.5 , 0 , - 12 )
113+ static_choices_list = ( 'static' , 'choices' , 'stop' , 'here' )
114+ choices_from_provider = ( 'choices' , 'provider' , 'probably' , 'improved' )
115+ completion_item_choices = ( CompletionItem ('choice_1' , 'A description' ), CompletionItem ('choice_2' , 'Another description' ))
116116
117117 # This tests that CompletionItems created with numerical values are sorted as numbers.
118- num_completion_items = [ CompletionItem (5 , "Five" ), CompletionItem (1.5 , "One.Five" ), CompletionItem (2 , "Five" )]
118+ num_completion_items = ( CompletionItem (5 , "Five" ), CompletionItem (1.5 , "One.Five" ), CompletionItem (2 , "Five" ))
119119
120- def choices_provider (self ) -> list [str ]:
120+ def choices_provider (self ) -> tuple [str ]:
121121 """Method that provides choices"""
122122 return self .choices_from_provider
123123
@@ -179,9 +179,9 @@ def do_choices(self, args: argparse.Namespace) -> None:
179179 ############################################################################################################
180180 # Begin code related to testing completer parameter
181181 ############################################################################################################
182- completions_for_flag = [ 'completions' , 'flag' , 'fairly' , 'complete' ]
183- completions_for_pos_1 = [ 'completions' , 'positional_1' , 'probably' , 'missed' , 'spot' ]
184- completions_for_pos_2 = [ 'completions' , 'positional_2' , 'probably' , 'missed' , 'me' ]
182+ completions_for_flag = ( 'completions' , 'flag' , 'fairly' , 'complete' )
183+ completions_for_pos_1 = ( 'completions' , 'positional_1' , 'probably' , 'missed' , 'spot' )
184+ completions_for_pos_2 = ( 'completions' , 'positional_2' , 'probably' , 'missed' , 'me' )
185185
186186 def flag_completer (self , text : str , line : str , begidx : int , endidx : int ) -> list [str ]:
187187 return self .basic_complete (text , line , begidx , endidx , self .completions_for_flag )
@@ -208,12 +208,12 @@ def do_completer(self, args: argparse.Namespace) -> None:
208208 ############################################################################################################
209209 # Begin code related to nargs
210210 ############################################################################################################
211- set_value_choices = [ 'set' , 'value' , 'choices' ]
212- one_or_more_choices = [ 'one' , 'or' , 'more' , 'choices' ]
213- optional_choices = [ 'a' , 'few' , 'optional' , 'choices' ]
214- range_choices = [ 'some' , 'range' , 'choices' ]
215- remainder_choices = [ 'remainder' , 'choices' ]
216- positional_choices = [ 'the' , 'positional' , 'choices' ]
211+ set_value_choices = ( 'set' , 'value' , 'choices' )
212+ one_or_more_choices = ( 'one' , 'or' , 'more' , 'choices' )
213+ optional_choices = ( 'a' , 'few' , 'optional' , 'choices' )
214+ range_choices = ( 'some' , 'range' , 'choices' )
215+ remainder_choices = ( 'remainder' , 'choices' )
216+ positional_choices = ( 'the' , 'positional' , 'choices' )
217217
218218 nargs_parser = Cmd2ArgumentParser ()
219219
@@ -572,10 +572,9 @@ def test_autocomp_flag_choices_completion(ac_app, flag, text, completions) -> No
572572
573573 # Numbers will be sorted in ascending order and then converted to strings by ArgparseCompleter
574574 if completions and all (isinstance (x , numbers .Number ) for x in completions ):
575- completions .sort ()
576- completions = [str (x ) for x in completions ]
575+ completions = [str (x ) for x in sorted (completions )]
577576 else :
578- completions . sort ( key = ac_app .default_sort_key )
577+ completions = sorted ( completions , key = ac_app .default_sort_key )
579578
580579 assert ac_app .completion_matches == completions
581580
@@ -606,10 +605,9 @@ def test_autocomp_positional_choices_completion(ac_app, pos, text, completions)
606605
607606 # Numbers will be sorted in ascending order and then converted to strings by ArgparseCompleter
608607 if completions and all (isinstance (x , numbers .Number ) for x in completions ):
609- completions .sort ()
610- completions = [str (x ) for x in completions ]
608+ completions = [str (x ) for x in sorted (completions )]
611609 else :
612- completions . sort ( key = ac_app .default_sort_key )
610+ completions = sorted ( completions , key = ac_app .default_sort_key )
613611
614612 assert ac_app .completion_matches == completions
615613
0 commit comments