summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAndrew Kuchling <amk@amk.ca>2014-04-16 01:21:56 (GMT)
committerAndrew Kuchling <amk@amk.ca>2014-04-16 01:21:56 (GMT)
commit42a17fa4fde35f214b18f4cd0f0c69e1117c4b8a (patch)
tree8f792f28f3e7650b2d2e4793e46f026aa1363d58 /Modules
parent1b28088fd35938cae197fbdf673aac995ecb1ab5 (diff)
parent45278a898c0d6ac5a38a07b525fb216d9afa36df (diff)
downloadcpython-42a17fa4fde35f214b18f4cd0f0c69e1117c4b8a.zip
cpython-42a17fa4fde35f214b18f4cd0f0c69e1117c4b8a.tar.gz
cpython-42a17fa4fde35f214b18f4cd0f0c69e1117c4b8a.tar.bz2
Merge from 3.4
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_io/iobase.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index e372990..ef06b43 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -42,8 +42,8 @@ PyDoc_STRVAR(iobase_doc,
"bytes. bytearrays are accepted too, and in some cases (such as\n"
"readinto) needed. Text I/O classes work with str data.\n"
"\n"
- "Note that calling any method (even inquiries) on a closed stream is\n"
- "undefined. Implementations may raise IOError in this case.\n"
+ "Note that calling any method (except additional calls to close(),\n"
+ "which are ignored) on a closed stream should raise a ValueError.\n"
"\n"
"IOBase (and its subclasses) support the iterator protocol, meaning\n"
"that an IOBase object can be iterated over yielding the lines in a\n"