Replaced type(...) and type(ellipsis) with types.EllipsisType

Bas van Beek · Bas van Beek · commit 0a97a885178a · 2020-09-21T12:28:29.000+02:00
diff --git a/Lib/ast.py b/Lib/ast.py
@@ -24,6 +24,7 @@
     :copyright: Copyright 2008 by Armin Ronacher.
     :license: Python License.
 """
+import types
 import sys
 from _ast import *
 from contextlib import contextmanager, nullcontext
@@ -572,7 +573,7 @@ def __new__(cls, *args, **kwargs):
     Str: (str,),
     Bytes: (bytes,),
     NameConstant: (type(None), bool),
-    Ellipsis: (type(...),),
+    Ellipsis: (types.EllipsisType,),
 }
 _const_types_not = {
     Num: (bool,),
@@ -586,7 +587,7 @@ def __new__(cls, *args, **kwargs):
     complex: 'Num',
     str: 'Str',
     bytes: 'Bytes',
-    type(...): 'Ellipsis',
+    types.EllipsisType: 'Ellipsis',
 }
 
 class slice(AST):
diff --git a/Lib/copy.py b/Lib/copy.py
@@ -108,8 +108,8 @@ def _copy_immutable(x):
     return x
 for t in (type(None), int, float, bool, complex, str, tuple,
           bytes, frozenset, type, range, slice, property,
-          types.BuiltinFunctionType, type(Ellipsis), type(NotImplemented),
-          types.FunctionType, weakref.ref):
+          types.BuiltinFunctionType, types.EllipsisType,
+          type(NotImplemented), types.FunctionType, weakref.ref):
     d[t] = _copy_immutable
 t = getattr(types, "CodeType", None)
 if t is not None:
@@ -182,7 +182,7 @@ def deepcopy(x, memo=None, _nil=[]):
 def _deepcopy_atomic(x, memo):
     return x
 d[type(None)] = _deepcopy_atomic
-d[type(Ellipsis)] = _deepcopy_atomic
+d[types.EllipsisType] = _deepcopy_atomic
 d[type(NotImplemented)] = _deepcopy_atomic
 d[int] = _deepcopy_atomic
 d[float] = _deepcopy_atomic
diff --git a/Lib/lib2to3/fixes/fix_types.py b/Lib/lib2to3/fixes/fix_types.py
@@ -30,7 +30,6 @@
         'ComplexType' : 'complex',
         'DictType': 'dict',
         'DictionaryType' : 'dict',
-        'EllipsisType' : 'type(Ellipsis)',
         #'FileType' : 'io.IOBase',
         'FloatType': 'float',
         'IntType': 'int',
diff --git a/Lib/pickle.py b/Lib/pickle.py
@@ -23,7 +23,7 @@
 
 """
 
-from types import FunctionType
+from types import FunctionType, EllipsisType
 from copyreg import dispatch_table
 from copyreg import _extension_registry, _inverted_registry, _extension_cache
 from itertools import islice
@@ -1121,7 +1121,7 @@ def save_type(self, obj):
             return self.save_reduce(type, (None,), obj=obj)
         elif obj is type(NotImplemented):
             return self.save_reduce(type, (NotImplemented,), obj=obj)
-        elif obj is type(...):
+        elif obj is EllipsisType:
             return self.save_reduce(type, (...,), obj=obj)
         return self.save_global(obj)
 
