Darn. Of course the warning that Tim killed on the trunk must also be

killed in the branch.

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 922f23179fa9073efb8226fb79924be6f3d90d41..848e0a6137cc5982b30fffca9ac05fc3aae0ab67 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -91,7 +91,8 @@ type_get_doc(PyTypeObject *type, void *context)
                Py_INCREF(result);
        }
        else if (result->ob_type->tp_descr_get) {
-               result = result->ob_type->tp_descr_get(result, NULL, type);
+               result = result->ob_type->tp_descr_get(result, NULL,
+                                                      (PyObject *)type);
        }
        else {
                Py_INCREF(result);