From: Ned Deily <nad@acm.org>
Date: Wed, 9 Mar 2011 10:49:59 +0000 (-0800)
Subject: Issue #5622: merge fix from 3.2.
X-Git-Tag: v3.3.0a1~2969
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33cb5c9017df9f0aeb52b90cc8cd7ee37dd5f136;p=thirdparty%2FPython%2Fcpython.git

Issue #5622: merge fix from 3.2.
---

33cb5c9017df9f0aeb52b90cc8cd7ee37dd5f136
diff --cc Misc/NEWS
index 41c5edc90775,a071a900e07e..9d6ed3a10fd3
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -55,9 -31,9 +55,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #5622: Fix curses.wrapper to raise correct exception if curses
+   initialization fails.
+ 
 +- Issue #11408: In threading.Lock.acquire(), only call gettimeofday() when
 +  really necessary.  Patch by Charles-François Natali.
 +
  - Issue #11391: Writing to a mmap object created with
    ``mmap.PROT_READ|mmap.PROT_EXEC`` would segfault instead of raising a
    TypeError.  Patch by Charles-François Natali.