Removed more types from the types module

diff --git a/Doc/library/types.rst b/Doc/library/types.rst
index 48940676473099527cbb7e2edea8f741c6948b84..a3d30fa97995d74567b3e23b85416d97edc2c362 100644 (file)
--- a/Doc/library/types.rst
+++ b/Doc/library/types.rst
@@ -85,11 +85,6 @@ The module defines the following names:
    traceback object.
 
 
-.. data:: DictProxyType
-
-   The type of dict proxies, such as ``type.__dict__``.
-
-
 .. data:: GetSetDescriptorType
 
    The type of objects defined in extension modules with ``PyGetSetDef``, such as

diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py
index d91c0107afc8bc2b97313d3234aa4498d3ca3e36..122aac085cbaba68846636661c3a80e35d76095a 100644 (file)
--- a/Lib/_abcoll.py
+++ b/Lib/_abcoll.py
@@ -18,7 +18,7 @@ __all__ = ["Hashable", "Iterable", "Iterator",
            "Sequence", "MutableSequence",
            "ByteString",
            "bytearray_iterator", "bytes_iterator", "dict_itemiterator",
-           "dict_items", "dict_keyiterator", "dict_keys",
+           "dict_items", "dict_keyiterator", "dict_keys", "dict_proxy",
            "dict_valueiterator", "dict_values", "list_iterator",
            "list_reverseiterator", "range_iterator", "set_iterator",
            "str_iterator", "tuple_iterator", "zip_iterator",
@@ -44,6 +44,8 @@ zip_iterator = type(iter(zip()))
 dict_keys = type({}.keys())
 dict_values = type({}.values())
 dict_items = type({}.items())
+## misc ##
+dict_proxy = type(type.__dict__)
 
 
 ### ONE-TRICK PONIES ###

diff --git a/Lib/types.py b/Lib/types.py
index 72454a123faea7a51864f7b3e5a6dec7848e7fae..46a539accfa849194d158df959b424ba04e05ba7 100644 (file)
--- a/Lib/types.py
+++ b/Lib/types.py
@@ -20,7 +20,6 @@ GeneratorType = type(_g())
 
 class _C:
     def _m(self): pass
-ClassType = type
 MethodType = type(_C()._m)
 
 BuiltinFunctionType = type(len)
@@ -36,8 +35,6 @@ except TypeError:
     FrameType = type(tb.tb_frame)
     tb = None; del tb
 
-DictProxyType = type(type.__dict__)
-
 # Extension types defined in a C helper module.  XXX There may be no
 # equivalent in implementations other than CPython, so it seems better to
 # leave them undefined then to set them to e.g. None.