diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-04-20 02:09:13 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-04-20 02:09:13 (GMT) |
| commit | c485361f6129fbdc5f0258162b288977b7194084 (patch) | |
| tree | 1784ce30a95bf06f0c4301dadfd5c1be7c4631ea /Include | |
| parent | 7b5adc066a1fe3ffa61e4956944696f6352ac421 (diff) | |
| download | cpython-c485361f6129fbdc5f0258162b288977b7194084.zip cpython-c485361f6129fbdc5f0258162b288977b7194084.tar.gz cpython-c485361f6129fbdc5f0258162b288977b7194084.tar.bz2 | |
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
........
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/descrobject.h | 3 | ||||
| -rw-r--r-- | Include/sliceobject.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Include/descrobject.h b/Include/descrobject.h index 0d444b6..718f9d5 100644 --- a/Include/descrobject.h +++ b/Include/descrobject.h @@ -68,6 +68,9 @@ typedef struct { } PyWrapperDescrObject; 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 *); 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 @@ typedef struct { } PySliceObject; PyAPI_DATA(PyTypeObject) PySlice_Type; +PyAPI_DATA(PyTypeObject) PyEllipsis_Type; #define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type) |