[Python-checkins] r71756 - in python/branches/release26-maint: Include/descrobject.h Include/sliceobject.h Objects/descrobject.c Objects/object.c Objects/sliceobject.c
benjamin.peterson
python-checkins at python.org
Mon Apr 20 04:09:13 CEST 2009
Author: benjamin.peterson
Date: Mon Apr 20 04:09:13 2009
New Revision: 71756
Log:
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
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Include/descrobject.h
python/branches/release26-maint/Include/sliceobject.h
python/branches/release26-maint/Objects/descrobject.c
python/branches/release26-maint/Objects/object.c
python/branches/release26-maint/Objects/sliceobject.c
Modified: python/branches/release26-maint/Include/descrobject.h
==============================================================================
--- python/branches/release26-maint/Include/descrobject.h (original)
+++ python/branches/release26-maint/Include/descrobject.h Mon Apr 20 04:09:13 2009
@@ -68,6 +68,9 @@
} 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 *);
Modified: python/branches/release26-maint/Include/sliceobject.h
==============================================================================
--- python/branches/release26-maint/Include/sliceobject.h (original)
+++ python/branches/release26-maint/Include/sliceobject.h Mon Apr 20 04:09:13 2009
@@ -25,6 +25,7 @@
} PySliceObject;
PyAPI_DATA(PyTypeObject) PySlice_Type;
+PyAPI_DATA(PyTypeObject) PyEllipsis_Type;
#define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type)
Modified: python/branches/release26-maint/Objects/descrobject.c
==============================================================================
--- python/branches/release26-maint/Objects/descrobject.c (original)
+++ python/branches/release26-maint/Objects/descrobject.c Mon Apr 20 04:09:13 2009
@@ -456,7 +456,7 @@
0, /* tp_descr_set */
};
-static PyTypeObject PyMemberDescr_Type = {
+PyTypeObject PyMemberDescr_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"member_descriptor",
sizeof(PyMemberDescrObject),
@@ -493,7 +493,7 @@
(descrsetfunc)member_set, /* tp_descr_set */
};
-static PyTypeObject PyGetSetDescr_Type = {
+PyTypeObject PyGetSetDescr_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"getset_descriptor",
sizeof(PyGetSetDescrObject),
@@ -819,7 +819,7 @@
return PyObject_RichCompare(v->dict, w, op);
}
-static PyTypeObject proxytype = {
+PyTypeObject PyDictProxy_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"dictproxy", /* tp_name */
sizeof(proxyobject), /* tp_basicsize */
@@ -862,7 +862,7 @@
{
proxyobject *pp;
- pp = PyObject_GC_New(proxyobject, &proxytype);
+ pp = PyObject_GC_New(proxyobject, &PyDictProxy_Type);
if (pp != NULL) {
Py_INCREF(dict);
pp->dict = dict;
Modified: python/branches/release26-maint/Objects/object.c
==============================================================================
--- python/branches/release26-maint/Objects/object.c (original)
+++ python/branches/release26-maint/Objects/object.c Mon Apr 20 04:09:13 2009
@@ -2,6 +2,7 @@
/* Generic object operations; and implementation of None (NoObject) */
#include "Python.h"
+#include "frameobject.h"
#ifdef __cplusplus
extern "C" {
@@ -2027,6 +2028,12 @@
if (PyType_Ready(&_PyWeakref_RefType) < 0)
Py_FatalError("Can't initialize weakref type");
+ if (PyType_Ready(&_PyWeakref_CallableProxyType) < 0)
+ Py_FatalError("Can't initialize callable weakref proxy type");
+
+ if (PyType_Ready(&_PyWeakref_ProxyType) < 0)
+ Py_FatalError("Can't initialize weakref proxy type");
+
if (PyType_Ready(&PyBool_Type) < 0)
Py_FatalError("Can't initialize bool type");
@@ -2034,10 +2041,10 @@
Py_FatalError("Can't initialize str type");
if (PyType_Ready(&PyByteArray_Type) < 0)
- Py_FatalError("Can't initialize bytearray");
+ Py_FatalError("Can't initialize bytearray type");
if (PyType_Ready(&PyList_Type) < 0)
- Py_FatalError("Can't initialize list");
+ Py_FatalError("Can't initialize list type");
if (PyType_Ready(&PyNone_Type) < 0)
Py_FatalError("Can't initialize None type");
@@ -2072,8 +2079,10 @@
if (PyType_Ready(&PyStaticMethod_Type) < 0)
Py_FatalError("Can't initialize static method type");
+#ifndef WITHOUT_COMPLEX
if (PyType_Ready(&PyComplex_Type) < 0)
- Py_FatalError("Can't initalize complex type");
+ Py_FatalError("Can't initialize complex type");
+#endif
if (PyType_Ready(&PyFloat_Type) < 0)
Py_FatalError("Can't initialize float type");
@@ -2101,6 +2110,45 @@
if (PyType_Ready(&PyReversed_Type) < 0)
Py_FatalError("Can't initialize reversed type");
+
+ if (PyType_Ready(&PyCode_Type) < 0)
+ Py_FatalError("Can't initialize code type");
+
+ if (PyType_Ready(&PyFrame_Type) < 0)
+ Py_FatalError("Can't initialize frame type");
+
+ if (PyType_Ready(&PyCFunction_Type) < 0)
+ Py_FatalError("Can't initialize builtin function type");
+
+ if (PyType_Ready(&PyMethod_Type) < 0)
+ Py_FatalError("Can't initialize method type");
+
+ if (PyType_Ready(&PyFunction_Type) < 0)
+ Py_FatalError("Can't initialize function type");
+
+ if (PyType_Ready(&PyClass_Type) < 0)
+ Py_FatalError("Can't initialize class type");
+
+ if (PyType_Ready(&PyDictProxy_Type) < 0)
+ Py_FatalError("Can't initialize dict proxy type");
+
+ if (PyType_Ready(&PyGen_Type) < 0)
+ Py_FatalError("Can't initialize generator type");
+
+ if (PyType_Ready(&PyGetSetDescr_Type) < 0)
+ Py_FatalError("Can't initialize get-set descriptor type");
+
+ if (PyType_Ready(&PyWrapperDescr_Type) < 0)
+ Py_FatalError("Can't initialize wrapper type");
+
+ if (PyType_Ready(&PyInstance_Type) < 0)
+ Py_FatalError("Can't initialize instance type");
+
+ if (PyType_Ready(&PyEllipsis_Type) < 0)
+ Py_FatalError("Can't initialize ellipsis type");
+
+ if (PyType_Ready(&PyMemberDescr_Type) < 0)
+ Py_FatalError("Can't initialize member descriptor type");
}
Modified: python/branches/release26-maint/Objects/sliceobject.c
==============================================================================
--- python/branches/release26-maint/Objects/sliceobject.c (original)
+++ python/branches/release26-maint/Objects/sliceobject.c Mon Apr 20 04:09:13 2009
@@ -22,7 +22,7 @@
return PyString_FromString("Ellipsis");
}
-static PyTypeObject PyEllipsis_Type = {
+PyTypeObject PyEllipsis_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"ellipsis", /* tp_name */
0, /* tp_basicsize */
More information about the Python-checkins
mailing list