1515 'Final' ,
1616 'LiteralString' ,
1717 'ParamSpec' ,
18+ 'ParamSpecArgs' ,
19+ 'ParamSpecKwargs' ,
1820 'Self' ,
1921 'Type' ,
2022 'TypeVarTuple' ,
@@ -933,9 +935,9 @@ def __init_subclass__(cls, *args, **kwargs):
933935 _BaseGenericAlias = typing ._GenericAlias
934936 try :
935937 # 3.9+
936- from typing import GenericAlias
938+ from typing import GenericAlias as _typing_GenericAlias
937939 except ImportError :
938- GenericAlias = typing ._GenericAlias
940+ _typing_GenericAlias = typing ._GenericAlias
939941
940942 def get_origin (tp ):
941943 """Get the unsubscripted version of a type.
@@ -954,7 +956,7 @@ def get_origin(tp):
954956 """
955957 if isinstance (tp , _AnnotatedAlias ):
956958 return Annotated
957- if isinstance (tp , (typing ._GenericAlias , GenericAlias , _BaseGenericAlias ,
959+ if isinstance (tp , (typing ._GenericAlias , _typing_GenericAlias , _BaseGenericAlias ,
958960 ParamSpecArgs , ParamSpecKwargs )):
959961 return tp .__origin__
960962 if tp is typing .Generic :
@@ -974,7 +976,7 @@ def get_args(tp):
974976 """
975977 if isinstance (tp , _AnnotatedAlias ):
976978 return (tp .__origin__ ,) + tp .__metadata__
977- if isinstance (tp , (typing ._GenericAlias , GenericAlias )):
979+ if isinstance (tp , (typing ._GenericAlias , _typing_GenericAlias )):
978980 if getattr (tp , "_special" , False ):
979981 return ()
980982 res = tp .__args__
0 commit comments