From: Guido van Rossum <guido@python.org>
Date: Fri, 12 Jun 1998 14:28:38 +0000 (+0000)
Subject: Don't catch interrupts in getpass() -- the finally clause will reset
X-Git-Tag: v1.5.2a1~478
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3da02e9041cfaf8e6e43b726f23b2676a05eb1a;p=thirdparty%2FPython%2Fcpython.git

Don't catch interrupts in getpass() -- the finally clause will reset
the tty and the caller can deal with the interrupt.

In the windows version, recognize ^C and raise KeyboardInterrupt (not
sure if this is needed, but can't hurt).
---

diff --git a/Lib/getpass.py b/Lib/getpass.py
index 8bd75233f139..d67240eaf8aa 100644
--- a/Lib/getpass.py
+++ b/Lib/getpass.py
@@ -36,8 +36,7 @@ def getpass(prompt='Password: '):
 	new[3] = new[3] & ~TERMIOS.ECHO	# 3 == 'lflags'
 	try:
 		termios.tcsetattr(fd, TERMIOS.TCSADRAIN, new)
-		try: passwd = raw_input(prompt)
-		except KeyboardInterrupt: passwd = None
+		passwd = raw_input(prompt)
 	finally:
 		termios.tcsetattr(fd, TERMIOS.TCSADRAIN, old)
 
@@ -55,6 +54,8 @@ def win_getpass(prompt='Password: '):
 		c = msvcrt.getch()
 		if c == '\r' or c == '\n':
 			break
+		if c == '\003':
+			raise KeyboardInterrupt
 		if c == '\b':
 			pw = pw[:-1]
 		else: