Index: Doc/library/types.rst
===================================================================
--- Doc/library/types.rst	(revision 61570)
+++ Doc/library/types.rst	(working copy)
@@ -72,8 +72,12 @@
 
    The type of floating point numbers (e.g. ``1.0``); alias of the built-in
    :class:`float`.
+   
+.. data:: CellType
 
+   The type of cell objects.
 
+
 .. data:: ComplexType
 
    The type of complex numbers (e.g. ``1.0j``).  This is not defined if Python was
Index: Lib/types.py
===================================================================
--- Lib/types.py	(revision 61570)
+++ Lib/types.py	(working copy)
@@ -52,6 +52,12 @@
     yield 1
 GeneratorType = type(_g())
 
+def _f(x=None):
+   def g():
+      x
+   return g
+CellType = type(_f().func_closure[0])
+
 class _C:
     def _m(self): pass
 ClassType = type(_C)
@@ -86,16 +92,7 @@
 DictProxyType = type(TypeType.__dict__)
 NotImplementedType = type(NotImplemented)
 
-# 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.
-try:
-    import _types
-except ImportError:
-    pass
-else:
-    GetSetDescriptorType = type(_types.Helper.getter)
-    MemberDescriptorType = type(_types.Helper.member)
-    del _types
+GetSetDescriptorType = type(Exception.args)
+MemberDescriptorType = type(EnvironmentError.errno)
 
 del sys, _f, _g, _C, _x                           # Not for export
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in	(revision 61570)
+++ Makefile.pre.in	(working copy)
@@ -331,7 +331,6 @@
 ##########################################################################
 # objects that get linked into the Python library
 LIBRARY_OBJS=	\
-		Modules/_typesmodule.o \
 		Modules/getbuildinfo.o \
 		$(PARSER_OBJS) \
 		$(OBJECT_OBJS) \
@@ -369,7 +368,6 @@
 $(LIBRARY): $(LIBRARY_OBJS)
 	-rm -f $@
 	$(AR) cr $@ Modules/getbuildinfo.o
-	$(AR) cr $@ Modules/_typesmodule.o
 	$(AR) cr $@ $(PARSER_OBJS)
 	$(AR) cr $@ $(OBJECT_OBJS)
 	$(AR) cr $@ $(PYTHON_OBJS)
Index: Modules/_typesmodule.c
===================================================================
--- Modules/_typesmodule.c	(revision 61570)
+++ Modules/_typesmodule.c	(working copy)
@@ -1,93 +0,0 @@
-/* This extension module exposes some types that are only available at the
- * C level.  It should not be used directly, but instead through the Python
- * level types modules, which imports this.
- */
-
-#include "Python.h"
-#include "structmember.h"
-
-typedef struct
-{
-    PyObject_HEAD
-    int member;
-} Helper;
-
-static PyMemberDef helper_members[] = {
-    { "member", T_INT,  offsetof(Helper, member), READONLY,
-      PyDoc_STR("A member descriptor")
-    },
-    { NULL }
-};
-
-static PyObject *
-helper_getter(Helper *self, void *unused) 
-{
-    Py_RETURN_NONE;
-}
-
-static PyGetSetDef helper_getset[] = {
-    { "getter", (getter)helper_getter, NULL,
-      PyDoc_STR("A getset descriptor"),
-    },
-    { NULL }
-};
-
-static PyTypeObject HelperType = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    "_types.Helper",				/* tp_name */
-    sizeof(Helper),                             /* tp_basicsize */
-    0,						/* tp_itemsize */
-    0,						/* tp_dealloc */
-    0,						/* tp_print */
-    0,						/* tp_getattr */
-    0,						/* tp_setattr */
-    0,						/* tp_compare */
-    0,                                          /* tp_repr */
-    0,                                          /* tp_as_number */
-    0,						/* tp_as_sequence */
-    0,						/* tp_as_mapping */
-    0,                                          /* tp_hash */
-    0,              				/* tp_call */
-    0,          				/* tp_str */
-    0,                                          /* tp_getattro */
-    0,						/* tp_setattro */
-    0,						/* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT,                         /* tp_flags */
-    0,      					/* tp_doc */
-    0,						/* tp_traverse */
-    0,						/* tp_clear */
-    0,                                          /* tp_richcompare */
-    0,						/* tp_weaklistoffset */
-    0,						/* tp_iter */
-    0,						/* tp_iternext */
-    0,      					/* tp_methods */
-    helper_members,                             /* tp_members */
-    helper_getset,                              /* tp_getset */
-    0,						/* tp_base */
-    0,						/* tp_dict */
-    0,						/* tp_descr_get */
-    0,						/* tp_descr_set */
-    0,						/* tp_dictoffset */
-    0,						/* tp_init */
-    0,						/* tp_alloc */
-    0,                                          /* tp_new */
-    0,						/* tp_free */
-};
-
-PyMODINIT_FUNC
-init_types(void)
-{
-    PyObject *m;
-
-    m = Py_InitModule3("_types", NULL, "A types module helper");
-    if (!m)
-        return;
-
-    if (PyType_Ready(&HelperType) < 0)
-        return;
-
-    Py_INCREF(&HelperType);
-    PyModule_AddObject(m, "Helper", (PyObject *)&HelperType);
-}
-
-    
Index: Modules/config.c.in
===================================================================
--- Modules/config.c.in	(revision 61570)
+++ Modules/config.c.in	(working copy)
@@ -43,9 +43,6 @@
 	/* This lives in Python/Python-ast.c */
 	{"_ast", init_ast},
 
-	/* This lives in Modules/_typesmodule.c */
-	{"_types", init_types},
-
 	/* These entries are here for sys.builtin_module_names */
 	{"__main__", NULL},
 	{"__builtin__", NULL},