From 6a38ceda034df6b0be6ed41edbdc28f76e7e7805 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 14 Jun 2009 18:32:19 +0000
Subject: just throw a normal AttributeError for no buffer attribute

---
 Misc/NEWS              | 3 +++
 Modules/_io/stringio.c | 9 ---------
 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}
 };
-- 
cgit v0.12