bpo-32873: Remove a name hack for generic aliases in typing module (GH-6376)
This removes a hack and replaces it with a proper
mapping {'list': 'List', 'dict': 'Dict', ...}.
(cherry picked from commit 2a363d2930e29ec6d8a774973ed5a4965f881f5f)
Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com>diff --git a/Lib/typing.py b/Lib/typing.py
index 3ac3b93..d45502f 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -611,6 +611,19 @@
# * __args__ is a tuple of all arguments used in subscripting,
# e.g., Dict[T, int].__args__ == (T, int).
+
+# Mapping from non-generic type names that have a generic alias in typing
+# but with a different name.
+_normalize_alias = {'list': 'List',
+ 'tuple': 'Tuple',
+ 'dict': 'Dict',
+ 'set': 'Set',
+ 'frozenset': 'FrozenSet',
+ 'deque': 'Deque',
+ 'defaultdict': 'DefaultDict',
+ 'type': 'Type',
+ 'Set': 'AbstractSet'}
+
def _is_dunder(attr):
return attr.startswith('__') and attr.endswith('__')
@@ -629,7 +642,7 @@
self._special = special
if special and name is None:
orig_name = origin.__name__
- name = orig_name[0].title() + orig_name[1:]
+ name = _normalize_alias.get(orig_name, orig_name)
self._name = name
if not isinstance(params, tuple):
params = (params,)