From: Andrew M. Kuchling <amk@amk.ca>
Date: Sat, 10 Jun 2000 23:39:05 +0000 (+0000)
Subject: Applied simplifications suggested by Greg Stein.
X-Git-Tag: v2.0b1~1517
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5185a084b795759f83101d40122c0b6e207157c9;p=thirdparty%2FPython%2Fcpython.git

Applied simplifications suggested by Greg Stein.
---

diff --git a/Lib/curses/wrapper.py b/Lib/curses/wrapper.py
index 1de17ee5d1b4..fd8804d9f2c1 100644
--- a/Lib/curses/wrapper.py
+++ b/Lib/curses/wrapper.py
@@ -17,7 +17,6 @@ def wrapper(func, *rest):
     wrapper().
     """
     
-    res = None
     try:
 	# Initialize curses
 	stdscr=curses.initscr()
@@ -30,21 +29,11 @@ def wrapper(func, *rest):
 	# a special value like curses.KEY_LEFT will be returned
         stdscr.keypad(1)
 
-        res = apply(func, (stdscr,) + rest)
-    except:
-	# In the event of an error, restore the terminal
-	# to a sane state.
+	return apply(func, (stdscr,) + rest)
+
+    finally:
+	# Restore the terminal to a sane state on the way out.
 	stdscr.keypad(0)
 	curses.echo() ; curses.nocbreak()
 	curses.endwin()
-        # Pass the exception upwards
-        (exc_type, exc_value, exc_traceback) = sys.exc_info()
-        raise exc_type, exc_value, exc_traceback
-    else:
-	# Set everything back to normal
-	stdscr.keypad(0)
-	curses.echo() ; curses.nocbreak()
-	curses.endwin()		 # Terminate curses
-
-        return res