diff options
author | Benjamin Peterson <benjamin@python.org> | 2011-07-03 18:50:16 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2011-07-03 18:50:16 (GMT) |
commit | ffada78059d914619a997d57804c3fd2696a6e37 (patch) | |
tree | e4aafdc553a3ec4328291f86737736d8ea200f92 /Misc | |
parent | 7b7099c36f30f1aca77f0ce285e3b68c4f23455e (diff) | |
parent | 9cf960c94fcd2ec044e1525bb8c51f85c9048f35 (diff) | |
download | cpython-ffada78059d914619a997d57804c3fd2696a6e37.zip cpython-ffada78059d914619a997d57804c3fd2696a6e37.tar.gz cpython-ffada78059d914619a997d57804c3fd2696a6e37.tar.bz2 |
merge 3.2
Diffstat (limited to 'Misc')
-rw-r--r-- | Misc/NEWS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -11,7 +11,7 @@ Core and Builtins ----------------- - Issue #12475: Prevent generators from leaking their exception state into the - callers frame as they return for the last time. + caller's frame as they return for the last time. - Issue #12291: You can now load multiple marshalled objects from a stream, with other data interleaved between marshalled objects. |