commit fd838e6c8462d5feecf949a271419d13bbc0d32c
author Benjamin Peterson <benjamin@python.org> Mon Apr 20 02:09:13 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Mon Apr 20 02:09:13 2009 +0000
tree 30c70d88ec7f51f9488d34814ea6a53f6f549b72
parent ea835e7a875b7964d1c9b6875f836948ede48969

Merged revisions 71734,71738-71739 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71734 | benjamin.peterson | 2009-04-18 17:15:26 -0500 (Sat, 18 Apr 2009) | 1 line

  many more types to initialize (I had to expose some of them)
........
  r71738 | benjamin.peterson | 2009-04-18 21:32:42 -0500 (Sat, 18 Apr 2009) | 1 line

  initialize weakref some weakref types
........
  r71739 | benjamin.peterson | 2009-04-18 21:40:43 -0500 (Sat, 18 Apr 2009) | 1 line

  make errors consistent
........

Include/descrobject.h

diff --git a/Include/descrobject.h b/Include/descrobject.h
index f06b421..15041ff 100644
--- a/Include/descrobject.h
+++ b/Include/descrobject.h
@@ -73,6 +73,8 @@
 PyAPI_DATA(PyTypeObject) PyMethodDescr_Type;
 PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
 PyAPI_DATA(PyTypeObject) PyDictProxy_Type;
+PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type;
+PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
 
 PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
 PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);

Include/sliceobject.h

diff --git a/Include/sliceobject.h b/Include/sliceobject.h
index dfc30c7..8ab62dd 100644
--- a/Include/sliceobject.h
+++ b/Include/sliceobject.h
@@ -25,6 +25,7 @@
 } PySliceObject;
 
 PyAPI_DATA(PyTypeObject) PySlice_Type;
+PyAPI_DATA(PyTypeObject) PyEllipsis_Type;
 
 #define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type)