From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Sun, 10 Apr 2011 07:34:35 +0000 (+0200)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a1~2630
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=344d26c7a08896a1eb54f638e80de0d0fadfad39;p=python

Merge with 3.2
---

344d26c7a08896a1eb54f638e80de0d0fadfad39
diff --cc Misc/NEWS
index e4eba6e038,b5dc98b238..fdd410b77d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -459,13 -257,11 +459,18 @@@ Test
  - Issue #10826: Prevent sporadic failure in test_subprocess on Solaris due
    to open door files.
  
 +- Issue #10990: Prevent tests from clobbering a set trace function.
 +
 +C-API
 +-----
 +
 +- PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with Mercurial.
 +
+ Documentation
+ -------------
+ 
+ - Issue #11818: Fix tempfile examples for Python 3.
+ 
  
  What's New in Python 3.2?
  =========================