15
15
'Final' ,
16
16
'LiteralString' ,
17
17
'ParamSpec' ,
18
+ 'ParamSpecArgs' ,
19
+ 'ParamSpecKwargs' ,
18
20
'Self' ,
19
21
'Type' ,
20
22
'TypeVarTuple' ,
@@ -933,9 +935,9 @@ def __init_subclass__(cls, *args, **kwargs):
933
935
_BaseGenericAlias = typing ._GenericAlias
934
936
try :
935
937
# 3.9+
936
- from typing import GenericAlias
938
+ from typing import GenericAlias as _typing_GenericAlias
937
939
except ImportError :
938
- GenericAlias = typing ._GenericAlias
940
+ _typing_GenericAlias = typing ._GenericAlias
939
941
940
942
def get_origin (tp ):
941
943
"""Get the unsubscripted version of a type.
@@ -954,7 +956,7 @@ def get_origin(tp):
954
956
"""
955
957
if isinstance (tp , _AnnotatedAlias ):
956
958
return Annotated
957
- if isinstance (tp , (typing ._GenericAlias , GenericAlias , _BaseGenericAlias ,
959
+ if isinstance (tp , (typing ._GenericAlias , _typing_GenericAlias , _BaseGenericAlias ,
958
960
ParamSpecArgs , ParamSpecKwargs )):
959
961
return tp .__origin__
960
962
if tp is typing .Generic :
@@ -974,7 +976,7 @@ def get_args(tp):
974
976
"""
975
977
if isinstance (tp , _AnnotatedAlias ):
976
978
return (tp .__origin__ ,) + tp .__metadata__
977
- if isinstance (tp , (typing ._GenericAlias , GenericAlias )):
979
+ if isinstance (tp , (typing ._GenericAlias , _typing_GenericAlias )):
978
980
if getattr (tp , "_special" , False ):
979
981
return ()
980
982
res = tp .__args__
0 commit comments