diff options
author | Benjamin Peterson <benjamin@python.org> | 2011-05-26 09:56:41 -0500 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2011-05-26 09:56:41 -0500 |
commit | c6d301734a460128524e79fa0acb5cac2bcd3260 (patch) | |
tree | 1e6d7e1cdd57b0c4983e8e9921d47380bb8503b1 | |
parent | ce333ffbea033715dfad11766b97f7722453079c (diff) | |
download | cpython-c6d301734a460128524e79fa0acb5cac2bcd3260.tar.gz |
raise an ValueError in getvalue() on closed StringIO (closes #12161)
Thanks for Catalin Iacob for the patch.
-rw-r--r-- | Lib/StringIO.py | 1 | ||||
-rw-r--r-- | Lib/test/test_StringIO.py | 4 | ||||
-rw-r--r-- | Misc/ACKS | 1 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 9 insertions, 0 deletions
diff --git a/Lib/StringIO.py b/Lib/StringIO.py index 340fae1229..f74a066773 100644 --- a/Lib/StringIO.py +++ b/Lib/StringIO.py @@ -266,6 +266,7 @@ class StringIO: 8th bit) will cause a UnicodeError to be raised when getvalue() is called. """ + _complain_ifclosed(self.closed) if self.buflist: self.buf += ''.join(self.buflist) self.buflist = [] diff --git a/Lib/test/test_StringIO.py b/Lib/test/test_StringIO.py index 4774c6dbf1..76fc3d76e1 100644 --- a/Lib/test/test_StringIO.py +++ b/Lib/test/test_StringIO.py @@ -100,6 +100,10 @@ class TestGenericStringIO(unittest.TestCase): self._fp.close() self.assertRaises(ValueError, self._fp.next) + def test_getvalue(self): + self._fp.close() + self.assertRaises(ValueError, self._fp.getvalue) + class TestStringIO(TestGenericStringIO): MODULE = StringIO @@ -382,6 +382,7 @@ Eric Huss Jeremy Hylton Gerhard Häring Fredrik Håård +Catalin Iacob Mihai Ibanescu Lars Immisch Bobby Impollonia @@ -83,6 +83,9 @@ Core and Builtins Library ------- +- Issue #12161: Cause StringIO.getvalue() to raise a ValueError when used on a + closed StringIO instance. + - Issue #12182: Fix pydoc.HTMLDoc.multicolumn() if Python uses the new (true) division (python -Qnew). Patch written by Ralf W. Grosse-Kunstleve. |