Revert the type(...) to types.... replacements

Reverts 2791a23 and 0a97a88.
Save this for a follow up.

Author: Bas van Beek

Lib/ast.py

@@ -24,7 +24,6 @@
     :copyright: Copyright 2008 by Armin Ronacher.
     :license: Python License.
 """
-import types
 import sys
 from _ast import *
 from contextlib import contextmanager, nullcontext
@@ -572,22 +571,22 @@ def __new__(cls, *args, **kwargs):
     Num: (int, float, complex),
     Str: (str,),
     Bytes: (bytes,),
-    NameConstant: (types.NoneType, bool),
-    Ellipsis: (types.EllipsisType,),
+    NameConstant: (type(None), bool),
+    Ellipsis: (type(...),),
 }
 _const_types_not = {
     Num: (bool,),
 }
 
 _const_node_type_names = {
     bool: 'NameConstant',  # should be before int
-    types.NoneType: 'NameConstant',
+    type(None): 'NameConstant',
     int: 'Num',
     float: 'Num',
     complex: 'Num',
     str: 'Str',
     bytes: 'Bytes',
-    types.EllipsisType: 'Ellipsis',
+    type(...): 'Ellipsis',
 }
 
 class slice(AST):

Lib/copy.py

@@ -106,10 +106,10 @@ def copy(x):
 
 def _copy_immutable(x):
     return x
-for t in (types.NoneType, int, float, bool, complex, str, tuple,
+for t in (type(None), int, float, bool, complex, str, tuple,
           bytes, frozenset, type, range, slice, property,
-          types.BuiltinFunctionType, types.EllipsisType,
-          types.NotImplementedType, types.FunctionType, weakref.ref):
+          types.BuiltinFunctionType, type(Ellipsis), type(NotImplemented),
+          types.FunctionType, weakref.ref):
     d[t] = _copy_immutable
 t = getattr(types, "CodeType", None)
 if t is not None:
@@ -181,9 +181,9 @@ def deepcopy(x, memo=None, _nil=[]):
 
 def _deepcopy_atomic(x, memo):
     return x
-d[types.NoneType] = _deepcopy_atomic
-d[types.EllipsisType] = _deepcopy_atomic
-d[types.NotImplementedType] = _deepcopy_atomic
+d[type(None)] = _deepcopy_atomic
+d[type(Ellipsis)] = _deepcopy_atomic
+d[type(NotImplemented)] = _deepcopy_atomic
 d[int] = _deepcopy_atomic
 d[float] = _deepcopy_atomic
 d[bool] = _deepcopy_atomic

Lib/distutils/unixccompiler.py

@@ -13,7 +13,7 @@
   * link shared library handled by 'cc -shared'
 """
 
-import os, sys, re, types
+import os, sys, re
 
 from distutils import sysconfig
 from distutils.dep_util import newer
@@ -157,7 +157,7 @@ def link(self, target_desc, objects,
 
         lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
                                    libraries)
-        if not isinstance(output_dir, (str, types.NoneType)):
+        if not isinstance(output_dir, (str, type(None))):
             raise TypeError("'output_dir' must be a string or None")
         if output_dir is not None:
             output_filename = os.path.join(output_dir, output_filename)

Lib/idlelib/run.py

@@ -15,7 +15,6 @@
 import _thread as thread
 import threading
 import warnings
-import types
 
 from idlelib import autocomplete  # AutoComplete, fetch_encodings
 from idlelib import calltip  # Calltip
@@ -559,7 +558,7 @@ def runcode(self, code):
         except SystemExit as e:
             if e.args:  # SystemExit called with an argument.
                 ob = e.args[0]
-                if not isinstance(ob, (types.NoneType, int)):
+                if not isinstance(ob, (type(None), int)):
                     print('SystemExit: ' + str(ob), file=sys.stderr)
             # Return to the interactive prompt.
         except:

Lib/imp.py

@@ -264,7 +264,7 @@ def find_module(name, path=None):
     """
     if not isinstance(name, str):
         raise TypeError("'name' must be a str, not {}".format(type(name)))
-    elif not isinstance(path, (types.NoneType, list)):
+    elif not isinstance(path, (type(None), list)):
         # Backwards-compatibility
         raise RuntimeError("'path' must be None or a list, "
                            "not {}".format(type(path)))

Lib/inspect.py

@@ -2034,7 +2034,7 @@ def wrap_value(s):
             except NameError:
                 raise RuntimeError()
 
-        if isinstance(value, (str, int, float, bytes, bool, types.NoneType)):
+        if isinstance(value, (str, int, float, bytes, bool, type(None))):
             return ast.Constant(value)
         raise RuntimeError()
 

Lib/lib2to3/fixes/fix_types.py

@@ -30,12 +30,15 @@
         'ComplexType' : 'complex',
         'DictType': 'dict',
         'DictionaryType' : 'dict',
+        'EllipsisType' : 'type(Ellipsis)',
         #'FileType' : 'io.IOBase',
         'FloatType': 'float',
         'IntType': 'int',
         'ListType': 'list',
         'LongType': 'int',
         'ObjectType' : 'object',
+        'NoneType': 'type(None)',
+        'NotImplementedType' : 'type(NotImplemented)',
         'SliceType' : 'slice',
         'StringType': 'bytes', # XXX ?
         'StringTypes' : '(str,)', # XXX ?

Lib/lib2to3/tests/test_fixers.py

@@ -3276,6 +3276,10 @@ def test_basic_types_convert(self):
         a = """int"""
         self.check(b, a)
 
+        b = """types.NoneType"""
+        a = """type(None)"""
+        self.check(b, a)
+
         b = "types.StringTypes"
         a = "(str,)"
         self.check(b, a)

Lib/pickle.py

@@ -23,7 +23,7 @@
 
 """
 
-import types
+from types import FunctionType
 from copyreg import dispatch_table
 from copyreg import _extension_registry, _inverted_registry, _extension_cache
 from itertools import islice
@@ -737,7 +737,7 @@ def save_reduce(self, func, args, state=None, listitems=None,
 
     def save_none(self, obj):
         self.write(NONE)
-    dispatch[types.NoneType] = save_none
+    dispatch[type(None)] = save_none
 
     def save_bool(self, obj):
         if self.proto >= 2:
@@ -1117,15 +1117,15 @@ def save_global(self, obj, name=None):
         self.memoize(obj)
 
     def save_type(self, obj):
-        if obj is types.NoneType:
+        if obj is type(None):
             return self.save_reduce(type, (None,), obj=obj)
-        elif obj is types.NotImplementedType:
+        elif obj is type(NotImplemented):
             return self.save_reduce(type, (NotImplemented,), obj=obj)
-        elif obj is types.EllipsisType:
+        elif obj is type(...):
             return self.save_reduce(type, (...,), obj=obj)
         return self.save_global(obj)
 
-    dispatch[types.FunctionType] = save_global
+    dispatch[FunctionType] = save_global
     dispatch[type] = save_type
 
 

Lib/pickletools.py

@@ -15,7 +15,6 @@
 import pickle
 import re
 import sys
-import types
 
 __all__ = ['dis', 'genops', 'optimize']
 
@@ -1018,7 +1017,7 @@ def __repr__(self):
 
 pynone = StackObject(
     name="None",
-    obtype=types.NoneType,
+    obtype=type(None),
     doc="The Python None object.")
 
 pytuple = StackObject(