merge 3.2 (#1616)

benjaminp · benjaminp · commit 6d8f744730c0 · 2011-09-06T07:56:47.000-04:00
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
@@ -704,7 +704,7 @@ static PyMethodDef iobase_methods[] = {
 };
 
 static PyGetSetDef iobase_getset[] = {
-    {"__dict__", iobase_get_dict, NULL, NULL},
+    {"__dict__", (getter)iobase_get_dict, NULL, NULL},
     {"closed", (getter)iobase_closed_get, NULL, NULL},
     {NULL}
 };
