mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-44524: Do not set _name of _SpecialForm without need (GH-27861)

Browse source 
Because setting non-empty _name affects behavior of other code.

In most cases __name__ can be derived from __origin__.__name__.
This commit is contained in:
Serhiy Storchaka 2021-08-21 09:47:59 +03:00 • committed by GitHub
parent 16b9be4861
commit 4ceec49559
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/typing.py
View file

@ -461,7 +461,7 @@ def ClassVar(self, parameters):
be used with isinstance() or issubclass().
"""
item = _type_check(parameters, f'{self} accepts only single type.')
return _GenericAlias(self, (item,), name="ClassVar")
return _GenericAlias(self, (item,))
@_SpecialForm
def Final(self, parameters):
@ -482,7 +482,7 @@ def Final(self, parameters):
There is no runtime checking of these properties.
"""
item = _type_check(parameters, f'{self} accepts only single type.')
return _GenericAlias(self, (item,), name="Final")
return _GenericAlias(self, (item,))
@_SpecialForm
def Union(self, parameters):
@ -520,12 +520,9 @@ def Union(self, parameters):
parameters = _remove_dups_flatten(parameters)
if len(parameters) == 1:
return parameters[0]
if len(parameters) == 2 and type(None) in parameters:
name = "Optional"
else:
name = "Union"
return _UnionGenericAlias(self, parameters, name=name)
return _UnionGenericAlias(self, parameters, name="Optional")
return _UnionGenericAlias(self, parameters)
@_SpecialForm
def Optional(self, parameters):
@ -570,7 +567,7 @@ def Literal(self, parameters):
except TypeError: # unhashable parameters
pass
return _LiteralGenericAlias(self, parameters, name="Literal")
return _LiteralGenericAlias(self, parameters)
@_SpecialForm
@ -609,7 +606,7 @@ def Concatenate(self, parameters):
"ParamSpec variable.")
msg = "Concatenate[arg, ...]: each arg must be a type."
parameters = tuple(_type_check(p, msg) for p in parameters)
return _ConcatenateGenericAlias(self, parameters, name="Concatenate")
return _ConcatenateGenericAlias(self, parameters)
@_SpecialForm
@ -657,7 +654,7 @@ def TypeGuard(self, parameters):
PEP 647 (User-Defined Type Guards).
"""
item = _type_check(parameters, f'{self} accepts only single type.')
return _GenericAlias(self, (item,), name="TypeGuard")
return _GenericAlias(self, (item,))
class ForwardRef(_Final, _root=True):
@ -962,7 +959,7 @@ class _BaseGenericAlias(_Final, _root=True):
def __getattr__(self, attr):
if attr in {'__name__', '__qualname__'}:
return self._name
return self._name or self.__origin__.__name__
# We are careful for copy and pickle.
# Also for simplicity we just don't relay all dunder names