@@ -62,6 +62,7 @@ _DictValidatorType: TypeAlias = Callable[[dict[str, Any]], dict[str, Any]]
6262_ClassValidatorType : TypeAlias = Callable [[object | str | None ], type [Any ] | None ]
6363_UserGroupValidatorType : TypeAlias = Callable [[str | int | None ], int ]
6464_AddressValidatorType : TypeAlias = Callable [[str | None ], _AddressType | None ]
65+ _CallableValidatorType : TypeAlias = Callable [[str | _HookType ], _HookType ]
6566
6667_ValidatorType : TypeAlias = (
6768 _BoolValidatorType
@@ -72,6 +73,7 @@ _ValidatorType: TypeAlias = (
7273 | _ClassValidatorType
7374 | _UserGroupValidatorType
7475 | _AddressValidatorType
76+ | _CallableValidatorType
7577)
7678
7779KNOWN_SETTINGS : list [Setting ]
@@ -181,7 +183,7 @@ def validate_class(val: str) -> str: ...
181183def validate_class (val : None ) -> None : ...
182184@overload
183185def validate_class (val : object ) -> object : ...
184- def validate_callable (arity : int ) -> Callable [[ str | _HookType ], _HookType ] : ...
186+ def validate_callable (arity : int ) -> _CallableValidatorType : ...
185187def validate_user (val : int | str | None ) -> int : ...
186188def validate_group (val : int | str | None ) -> int : ...
187189def validate_post_request (val : str | _HookType ) -> _PostRequestHookType : ...
@@ -741,7 +743,7 @@ class Paste(Setting):
741743class OnStarting (Setting ):
742744 name : ClassVar [str ]
743745 section : ClassVar [str ]
744- validator : ClassVar [Callable [[ str | _OnStartingHookType ], _OnStartingHookType ] ]
746+ validator : ClassVar [_CallableValidatorType ]
745747 type : ClassVar [Callable [..., Any ]]
746748 default : ClassVar [_OnStartingHookType ]
747749 desc : ClassVar [str ]
@@ -751,7 +753,7 @@ class OnStarting(Setting):
751753class OnReload (Setting ):
752754 name : ClassVar [str ]
753755 section : ClassVar [str ]
754- validator : ClassVar [Callable [[ str | _OnReloadHookType ], _OnReloadHookType ] ]
756+ validator : ClassVar [_CallableValidatorType ]
755757 type : ClassVar [Callable [..., Any ]]
756758 default : ClassVar [_OnReloadHookType ]
757759 desc : ClassVar [str ]
@@ -761,7 +763,7 @@ class OnReload(Setting):
761763class WhenReady (Setting ):
762764 name : ClassVar [str ]
763765 section : ClassVar [str ]
764- validator : ClassVar [Callable [[ str | _WhenReadyHookType ], _WhenReadyHookType ] ]
766+ validator : ClassVar [_CallableValidatorType ]
765767 type : ClassVar [Callable [..., Any ]]
766768 default : ClassVar [_WhenReadyHookType ]
767769 desc : ClassVar [str ]
@@ -771,7 +773,7 @@ class WhenReady(Setting):
771773class Prefork (Setting ):
772774 name : ClassVar [str ]
773775 section : ClassVar [str ]
774- validator : ClassVar [Callable [[ str | _PreForkHookType ], _PreForkHookType ] ]
776+ validator : ClassVar [_CallableValidatorType ]
775777 type : ClassVar [Callable [..., Any ]]
776778 default : ClassVar [_PreForkHookType ]
777779 desc : ClassVar [str ]
@@ -781,7 +783,7 @@ class Prefork(Setting):
781783class Postfork (Setting ):
782784 name : ClassVar [str ]
783785 section : ClassVar [str ]
784- validator : ClassVar [Callable [[ str | _PostForkHookType ], _PostForkHookType ] ]
786+ validator : ClassVar [_CallableValidatorType ]
785787 type : ClassVar [Callable [..., Any ]]
786788 default : ClassVar [_PostForkHookType ]
787789 desc : ClassVar [str ]
@@ -791,7 +793,7 @@ class Postfork(Setting):
791793class PostWorkerInit (Setting ):
792794 name : ClassVar [str ]
793795 section : ClassVar [str ]
794- validator : ClassVar [Callable [[ str | _PostWorkerInitHookType ], _PostWorkerInitHookType ] ]
796+ validator : ClassVar [_CallableValidatorType ]
795797 type : ClassVar [Callable [..., Any ]]
796798 default : ClassVar [_PostWorkerInitHookType ]
797799 desc : ClassVar [str ]
@@ -801,7 +803,7 @@ class PostWorkerInit(Setting):
801803class WorkerInt (Setting ):
802804 name : ClassVar [str ]
803805 section : ClassVar [str ]
804- validator : ClassVar [Callable [[ str | _WorkerIntHookType ], _WorkerIntHookType ] ]
806+ validator : ClassVar [_CallableValidatorType ]
805807 type : ClassVar [Callable [..., Any ]]
806808 default : ClassVar [_WorkerIntHookType ]
807809 desc : ClassVar [str ]
@@ -811,7 +813,7 @@ class WorkerInt(Setting):
811813class WorkerAbort (Setting ):
812814 name : ClassVar [str ]
813815 section : ClassVar [str ]
814- validator : ClassVar [Callable [[ str | _WorkerAbortHookType ], _WorkerAbortHookType ] ]
816+ validator : ClassVar [_CallableValidatorType ]
815817 type : ClassVar [Callable [..., Any ]]
816818 default : ClassVar [_WorkerAbortHookType ]
817819 desc : ClassVar [str ]
@@ -821,7 +823,7 @@ class WorkerAbort(Setting):
821823class PreExec (Setting ):
822824 name : ClassVar [str ]
823825 section : ClassVar [str ]
824- validator : ClassVar [Callable [[ str | _PreExecHookType ], _PreExecHookType ] ]
826+ validator : ClassVar [_CallableValidatorType ]
825827 type : ClassVar [Callable [..., Any ]]
826828 default : ClassVar [_PreExecHookType ]
827829 desc : ClassVar [str ]
@@ -831,7 +833,7 @@ class PreExec(Setting):
831833class PreRequest (Setting ):
832834 name : ClassVar [str ]
833835 section : ClassVar [str ]
834- validator : ClassVar [Callable [[ str | _PreRequestHookType ], _PreRequestHookType ] ]
836+ validator : ClassVar [_CallableValidatorType ]
835837 type : ClassVar [Callable [..., Any ]]
836838 default : ClassVar [_PreRequestHookType ]
837839 desc : ClassVar [str ]
@@ -841,7 +843,7 @@ class PreRequest(Setting):
841843class PostRequest (Setting ):
842844 name : ClassVar [str ]
843845 section : ClassVar [str ]
844- validator : ClassVar [Callable [[ str | Callable [..., Any ]], _PostRequestHookType ] ]
846+ validator : ClassVar [_CallableValidatorType ]
845847 type : ClassVar [Callable [..., Any ]]
846848 default : ClassVar [_PostRequestHookType ]
847849 desc : ClassVar [str ]
@@ -851,7 +853,7 @@ class PostRequest(Setting):
851853class ChildExit (Setting ):
852854 name : ClassVar [str ]
853855 section : ClassVar [str ]
854- validator : ClassVar [Callable [[ str | _ChildExitHookType ], _ChildExitHookType ] ]
856+ validator : ClassVar [_CallableValidatorType ]
855857 type : ClassVar [Callable [..., Any ]]
856858 default : ClassVar [_ChildExitHookType ]
857859 desc : ClassVar [str ]
@@ -861,7 +863,7 @@ class ChildExit(Setting):
861863class WorkerExit (Setting ):
862864 name : ClassVar [str ]
863865 section : ClassVar [str ]
864- validator : ClassVar [Callable [[ str | _WorkerExitHookType ], _WorkerExitHookType ] ]
866+ validator : ClassVar [_CallableValidatorType ]
865867 type : ClassVar [Callable [..., Any ]]
866868 default : ClassVar [_WorkerExitHookType ]
867869 desc : ClassVar [str ]
@@ -871,7 +873,7 @@ class WorkerExit(Setting):
871873class NumWorkersChanged (Setting ):
872874 name : ClassVar [str ]
873875 section : ClassVar [str ]
874- validator : ClassVar [Callable [[ str | _NumWorkersChangedHookType ], _NumWorkersChangedHookType ] ]
876+ validator : ClassVar [_CallableValidatorType ]
875877 type : ClassVar [Callable [..., Any ]]
876878 default : ClassVar [_NumWorkersChangedHookType ]
877879 desc : ClassVar [str ]
@@ -881,7 +883,7 @@ class NumWorkersChanged(Setting):
881883class OnExit (Setting ):
882884 name : ClassVar [str ]
883885 section : ClassVar [str ]
884- validator : ClassVar [Callable [[ str | _OnExitHookType ], _OnExitHookType ] ]
886+ validator : ClassVar [_CallableValidatorType ]
885887 default : ClassVar [_OnExitHookType ]
886888 desc : ClassVar [str ]
887889
@@ -890,7 +892,7 @@ class OnExit(Setting):
890892class NewSSLContext (Setting ):
891893 name : ClassVar [str ]
892894 section : ClassVar [str ]
893- validator : ClassVar [Callable [[ str | _SSLContextHookType ], _SSLContextHookType ] ]
895+ validator : ClassVar [_CallableValidatorType ]
894896 type : ClassVar [Callable [..., Any ]]
895897 default : ClassVar [_SSLContextHookType ]
896898 desc : ClassVar [str ]
0 commit comments