[Python-checkins] cpython (merge 3.2 -> default): merge 3.2 (#1616)

[benjamin.peterson]

http://hg.python.org/cpython/rev/f24352b0df86
changeset:   72303:f24352b0df86
parent:      72267:df673c6d3e0b
parent:      72302:4cf619af7dc8
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 06 07:56:47 2011 -0400
summary:
  merge 3.2 (#1616)

files:
  Modules/_io/iobase.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -704,7 +704,7 @@
 };
 
 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}
 };

-- 
Repository URL: http://hg.python.org/cpython