Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Drop back to old version of wrapper(); ESR reports that it broke things, 

and I lack the time to track down the cause.
This commit is contained in:
Andrew M. Kuchling 2000-06-27 00:50:40 +00:00
parent 7fd7e36b08
commit 8f790fe459
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/curses/wrapper.py
View File

@ -17,9 +17,11 @@ def wrapper(func, *rest):
wrapper(). wrapper().
""" """
res = None
try: try:
# Initialize curses # Initialize curses
stdscr=curses.initscr() stdscr=curses.initscr()
# Turn off echoing of keys, and enter cbreak mode, # Turn off echoing of keys, and enter cbreak mode,
# where no buffering is performed on keyboard input # where no buffering is performed on keyboard input
curses.noecho() ; curses.cbreak() curses.noecho() ; curses.cbreak()
@ -29,11 +31,21 @@ def wrapper(func, *rest):
# a special value like curses.KEY_LEFT will be returned # a special value like curses.KEY_LEFT will be returned
stdscr.keypad(1) stdscr.keypad(1)
return apply(func, (stdscr,) + rest) res = apply(func, (stdscr,) + rest)
except:
finally: # In the event of an error, restore the terminal
# Restore the terminal to a sane state on the way out. # to a sane state.
stdscr.keypad(0) stdscr.keypad(0)
curses.echo() ; curses.nocbreak() curses.echo() ; curses.nocbreak()
curses.endwin() 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