Applied simplifications suggested by Greg Stein.
This commit is contained in:
parent
b7f198e01a
commit
5185a084b7
|
@ -17,7 +17,6 @@ def wrapper(func, *rest):
|
||||||
wrapper().
|
wrapper().
|
||||||
"""
|
"""
|
||||||
|
|
||||||
res = None
|
|
||||||
try:
|
try:
|
||||||
# Initialize curses
|
# Initialize curses
|
||||||
stdscr=curses.initscr()
|
stdscr=curses.initscr()
|
||||||
|
@ -30,21 +29,11 @@ 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)
|
||||||
|
|
||||||
res = apply(func, (stdscr,) + rest)
|
return apply(func, (stdscr,) + rest)
|
||||||
except:
|
|
||||||
# In the event of an error, restore the terminal
|
finally:
|
||||||
# to a sane state.
|
# Restore the terminal to a sane state on the way out.
|
||||||
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
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue