summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-06-14 18:32:19 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-06-14 18:32:19 (GMT)
commit6a38ceda034df6b0be6ed41edbdc28f76e7e7805 (patch)
tree558b79f919de865e9380d86918f8e2eea7bd3576
parent2a8b54d29cc943e7b8bc493d5500463b0e0af5ff (diff)
downloadcpython-6a38ceda034df6b0be6ed41edbdc28f76e7e7805.zip
cpython-6a38ceda034df6b0be6ed41edbdc28f76e7e7805.tar.gz
cpython-6a38ceda034df6b0be6ed41edbdc28f76e7e7805.tar.bz2
just throw a normal AttributeError for no buffer attribute
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_io/stringio.c9
2 files changed, 3 insertions, 9 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 407681b..1ec5c53 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
Library
-------
+- Accessing io.StringIO.buffer now raises an AttributeError instead of
+ io.UnsupportedOperation.
+
- Issue #6271: mmap tried to close invalid file handle (-1) when annonymous.
(On Unix)
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index 57dacf9..84a15be 100644
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -646,14 +646,6 @@ stringio_writable(stringio *self, PyObject *args)
}
static PyObject *
-stringio_buffer(stringio *self, void *context)
-{
- PyErr_SetString(IO_STATE->unsupported_operation,
- "buffer attribute is unsupported on type StringIO");
- return NULL;
-}
-
-static PyObject *
stringio_closed(stringio *self, void *context)
{
CHECK_INITIALIZED(self);
@@ -703,7 +695,6 @@ static PyGetSetDef stringio_getset[] = {
Hopefully, a better solution, than adding these pseudo-attributes,
will be found.
*/
- {"buffer", (getter)stringio_buffer, NULL, NULL},
{"line_buffering", (getter)stringio_line_buffering, NULL, NULL},
{NULL}
};