SF bug #770485: cStringIO does not set closed attr
diff --git a/Lib/test/test_StringIO.py b/Lib/test/test_StringIO.py
index 8c367e8..c318eaa 100644
--- a/Lib/test/test_StringIO.py
+++ b/Lib/test/test_StringIO.py
@@ -55,6 +55,16 @@
f.close()
self.assertRaises(ValueError, f.write, 'frobnitz')
+ def test_closed_flag(self):
+ f = self.MODULE.StringIO()
+ self.assertEqual(f.closed, False)
+ f.close()
+ self.assertEqual(f.closed, True)
+ f = self.MODULE.StringIO("abc")
+ self.assertEqual(f.closed, False)
+ f.close()
+ self.assertEqual(f.closed, True)
+
def test_iterator(self):
eq = self.assertEqual
unless = self.failUnless
diff --git a/Misc/NEWS b/Misc/NEWS
index 410391c..1de08e7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,8 @@
Extension modules
-----------------
+- cStringIO now supports the f.closed attribute.
+
- The signal module now exposes SIGRTMIN and SIGRTMAX (if available).
Library
diff --git a/Modules/cStringIO.c b/Modules/cStringIO.c
index bc23c77..ac84ab0 100644
--- a/Modules/cStringIO.c
+++ b/Modules/cStringIO.c
@@ -88,6 +88,22 @@
}
static PyObject *
+IO_get_closed(IOobject *self, void *closure)
+{
+ PyObject *result = Py_False;
+
+ if (self->buf == NULL)
+ result = Py_True;
+ Py_INCREF(result);
+ return result;
+}
+
+static PyGetSetDef file_getsetlist[] = {
+ {"closed", (getter)IO_get_closed, NULL, "True if the file is closed"},
+ {0},
+};
+
+static PyObject *
IO_flush(IOobject *self, PyObject *unused) {
UNLESS (IO__opencheck(self)) return NULL;
@@ -455,6 +471,7 @@
static PyMemberDef O_memberlist[] = {
{"softspace", T_INT, offsetof(Oobject, softspace), 0,
"flag indicating that a space needs to be printed; used by print"},
+ /* getattr(f, "closed") is implemented without this table */
{NULL} /* Sentinel */
};
@@ -498,7 +515,8 @@
PyObject_SelfIter, /*tp_iter */
(iternextfunc)IO_iternext, /*tp_iternext */
O_methods, /*tp_methods */
- O_memberlist /*tp_members */
+ O_memberlist, /*tp_members */
+ file_getsetlist, /*tp_getset */
};
static PyObject *
@@ -614,7 +632,9 @@
0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */
(iternextfunc)IO_iternext, /* tp_iternext */
- I_methods /* tp_methods */
+ I_methods, /* tp_methods */
+ 0, /* tp_members */
+ file_getsetlist, /* tp_getset */
};
static PyObject *