Issue #5622: merge fix from 3.2.

2011-03-09 02:49:59 -08:00 · 2011-03-09 02:49:59 -08:00 · 33cb5c9017
parent df309939e5 2d12f96658
commit 33cb5c9017
2 changed files with 8 additions and 4 deletions
--- a/Lib/curses/wrapper.py
+++ b/Lib/curses/wrapper.py
@ -43,7 +43,8 @@ def wrapper(func, *args, **kwds):
        return func(stdscr, *args, **kwds)
    finally:
        # Set everything back to normal
-        stdscr.keypad(0)
-        curses.echo()
-        curses.nocbreak()
-        curses.endwin()
+        if 'stdscr' in locals():
+            stdscr.keypad(0)
+            curses.echo()
+            curses.nocbreak()
+            curses.endwin()
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -55,6 +55,9 @@ Core and Builtins
 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.