@@ -512,7 +512,7 @@ def get_group_from_info(
512
512
solved_info = solve_typer_info_defaults (group_info )
513
513
(
514
514
params ,
515
- convertors ,
515
+ converters ,
516
516
context_param_name ,
517
517
) = get_params_convertors_ctx_param_name_from_function (solved_info .callback )
518
518
cls = solved_info .cls or TyperGroup
@@ -529,7 +529,7 @@ def get_group_from_info(
529
529
callback = get_callback (
530
530
callback = solved_info .callback ,
531
531
params = params ,
532
- convertors = convertors ,
532
+ converters = converters ,
533
533
context_param_name = context_param_name ,
534
534
pretty_exceptions_short = pretty_exceptions_short ,
535
535
),
@@ -556,19 +556,19 @@ def get_params_convertors_ctx_param_name_from_function(
556
556
callback : Optional [Callable [..., Any ]],
557
557
) -> Tuple [List [Union [click .Argument , click .Option ]], Dict [str , Any ], Optional [str ]]:
558
558
params = []
559
- convertors = {}
559
+ converters = {}
560
560
context_param_name = None
561
561
if callback :
562
562
parameters = get_params_from_function (callback )
563
563
for param_name , param in parameters .items ():
564
564
if lenient_issubclass (param .annotation , click .Context ):
565
565
context_param_name = param_name
566
566
continue
567
- click_param , convertor = get_click_param (param )
568
- if convertor :
569
- convertors [param_name ] = convertor
567
+ click_param , converter = get_click_param (param )
568
+ if converter :
569
+ converters [param_name ] = converter
570
570
params .append (click_param )
571
- return params , convertors , context_param_name
571
+ return params , converters , context_param_name
572
572
573
573
574
574
def get_command_from_info (
@@ -586,7 +586,7 @@ def get_command_from_info(
586
586
use_help = inspect .cleandoc (use_help )
587
587
(
588
588
params ,
589
- convertors ,
589
+ converters ,
590
590
context_param_name ,
591
591
) = get_params_convertors_ctx_param_name_from_function (command_info .callback )
592
592
cls = command_info .cls or TyperCommand
@@ -596,7 +596,7 @@ def get_command_from_info(
596
596
callback = get_callback (
597
597
callback = command_info .callback ,
598
598
params = params ,
599
- convertors = convertors ,
599
+ converters = converters ,
600
600
context_param_name = context_param_name ,
601
601
pretty_exceptions_short = pretty_exceptions_short ,
602
602
),
@@ -617,12 +617,12 @@ def get_command_from_info(
617
617
618
618
619
619
def determine_type_convertor (type_ : Any ) -> Optional [Callable [[Any ], Any ]]:
620
- convertor : Optional [Callable [[Any ], Any ]] = None
620
+ converter : Optional [Callable [[Any ], Any ]] = None
621
621
if lenient_issubclass (type_ , Path ):
622
- convertor = param_path_convertor
622
+ converter = param_path_convertor
623
623
if lenient_issubclass (type_ , Enum ):
624
- convertor = generate_enum_convertor (type_ )
625
- return convertor
624
+ converter = generate_enum_convertor (type_ )
625
+ return converter
626
626
627
627
628
628
def param_path_convertor (value : Optional [str ] = None ) -> Optional [Path ]:
@@ -634,40 +634,40 @@ def param_path_convertor(value: Optional[str] = None) -> Optional[Path]:
634
634
def generate_enum_convertor (enum : Type [Enum ]) -> Callable [[Any ], Any ]:
635
635
val_map = {str (val .value ): val for val in enum }
636
636
637
- def convertor (value : Any ) -> Any :
637
+ def converter (value : Any ) -> Any :
638
638
if value is not None :
639
639
val = str (value )
640
640
if val in val_map :
641
641
key = val_map [val ]
642
642
return enum (key )
643
643
644
- return convertor
644
+ return converter
645
645
646
646
647
647
def generate_list_convertor (
648
- convertor : Optional [Callable [[Any ], Any ]], default_value : Optional [Any ]
648
+ converter : Optional [Callable [[Any ], Any ]], default_value : Optional [Any ]
649
649
) -> Callable [[Sequence [Any ]], Optional [List [Any ]]]:
650
650
def internal_convertor (value : Sequence [Any ]) -> Optional [List [Any ]]:
651
651
if default_value is None and len (value ) == 0 :
652
652
return None
653
- return [convertor (v ) if convertor else v for v in value ]
653
+ return [converter (v ) if converter else v for v in value ]
654
654
655
655
return internal_convertor
656
656
657
657
658
658
def generate_tuple_convertor (
659
659
types : Sequence [Any ],
660
660
) -> Callable [[Optional [Tuple [Any , ...]]], Optional [Tuple [Any , ...]]]:
661
- convertors = [determine_type_convertor (type_ ) for type_ in types ]
661
+ converters = [determine_type_convertor (type_ ) for type_ in types ]
662
662
663
663
def internal_convertor (
664
664
param_args : Optional [Tuple [Any , ...]],
665
665
) -> Optional [Tuple [Any , ...]]:
666
666
if param_args is None :
667
667
return None
668
668
return tuple (
669
- convertor (arg ) if convertor else arg
670
- for (convertor , arg ) in zip (convertors , param_args )
669
+ converter (arg ) if converter else arg
670
+ for (converter , arg ) in zip (converters , param_args )
671
671
)
672
672
673
673
return internal_convertor
@@ -677,11 +677,11 @@ def get_callback(
677
677
* ,
678
678
callback : Optional [Callable [..., Any ]] = None ,
679
679
params : Sequence [click .Parameter ] = [],
680
- convertors : Optional [Dict [str , Callable [[str ], Any ]]] = None ,
680
+ converters : Optional [Dict [str , Callable [[str ], Any ]]] = None ,
681
681
context_param_name : Optional [str ] = None ,
682
682
pretty_exceptions_short : bool ,
683
683
) -> Optional [Callable [..., Any ]]:
684
- use_convertors = convertors or {}
684
+ use_convertors = converters or {}
685
685
if not callback :
686
686
return None
687
687
parameters = get_params_from_function (callback )
@@ -872,13 +872,13 @@ def get_click_param(
872
872
parameter_type = get_click_type (
873
873
annotation = main_type , parameter_info = parameter_info
874
874
)
875
- convertor = determine_type_convertor (main_type )
875
+ converter = determine_type_convertor (main_type )
876
876
if is_list :
877
- convertor = generate_list_convertor (
878
- convertor = convertor , default_value = default_value
877
+ converter = generate_list_convertor (
878
+ converter = converter , default_value = default_value
879
879
)
880
880
if is_tuple :
881
- convertor = generate_tuple_convertor (get_args (main_type ))
881
+ converter = generate_tuple_convertor (get_args (main_type ))
882
882
if isinstance (parameter_info , OptionInfo ):
883
883
if main_type is bool and parameter_info .is_flag is not False :
884
884
is_flag = True
@@ -920,7 +920,7 @@ def get_click_param(
920
920
required = required ,
921
921
default = default_value ,
922
922
callback = get_param_callback (
923
- callback = parameter_info .callback , convertor = convertor
923
+ callback = parameter_info .callback , converter = converter
924
924
),
925
925
metavar = parameter_info .metavar ,
926
926
expose_value = parameter_info .expose_value ,
@@ -931,7 +931,7 @@ def get_click_param(
931
931
# Rich settings
932
932
rich_help_panel = parameter_info .rich_help_panel ,
933
933
),
934
- convertor ,
934
+ converter ,
935
935
)
936
936
elif isinstance (parameter_info , ArgumentInfo ):
937
937
param_decls = [param .name ]
@@ -954,7 +954,7 @@ def get_click_param(
954
954
# Parameter
955
955
default = default_value ,
956
956
callback = get_param_callback (
957
- callback = parameter_info .callback , convertor = convertor
957
+ callback = parameter_info .callback , converter = converter
958
958
),
959
959
metavar = parameter_info .metavar ,
960
960
expose_value = parameter_info .expose_value ,
@@ -965,15 +965,15 @@ def get_click_param(
965
965
# Rich settings
966
966
rich_help_panel = parameter_info .rich_help_panel ,
967
967
),
968
- convertor ,
968
+ converter ,
969
969
)
970
970
raise AssertionError ("A click.Parameter should be returned" ) # pragma: no cover
971
971
972
972
973
973
def get_param_callback (
974
974
* ,
975
975
callback : Optional [Callable [..., Any ]] = None ,
976
- convertor : Optional [Callable [..., Any ]] = None ,
976
+ converter : Optional [Callable [..., Any ]] = None ,
977
977
) -> Optional [Callable [..., Any ]]:
978
978
if not callback :
979
979
return None
@@ -1011,8 +1011,8 @@ def wrapper(ctx: click.Context, param: click.Parameter, value: Any) -> Any:
1011
1011
if click_param_name :
1012
1012
use_params [click_param_name ] = param
1013
1013
if value_name :
1014
- if convertor :
1015
- use_value = convertor (value )
1014
+ if converter :
1015
+ use_value = converter (value )
1016
1016
else :
1017
1017
use_value = value
1018
1018
use_params [value_name ] = use_value
0 commit comments