summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-12-20 12:55:15 -0600
committerBenjamin Peterson <benjamin@python.org>2012-12-20 12:55:15 -0600
commit302c65443e2470b68dd1acae8aa9fba26215a9c6 (patch)
tree3d7fca059218b4cbef69b518914733eb7ff7a0dc
parent4c05969fc41d83e7da9ee3a2e15285a60b68ce23 (diff)
parent3d3daf0b7fc5a1064f3eead47e5f62cc317afd6c (diff)
downloadcpython-git-302c65443e2470b68dd1acae8aa9fba26215a9c6.tar.gz
merge 3.3 (#16597)
-rw-r--r--Misc/NEWS4
1 files changed, 2 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d826d6f2c0..15ab07a50f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,8 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins
-----------------
-- Issue #16597: Make BufferedIO.close call close() on the underlying stream if
- invoking flush() fails.
+- Issue #16597: In buffered and text IO, call close() on the underlying stream
+ if invoking flush() fails.
- Issue #16722: In the bytes() constructor, try to call __bytes__ on the
argument before __index__.