[Python-checkins] cpython (merge 3.1 -> 3.2): merge from 3.1 codeline.

Tue Apr 26 15:01:26 CEST 2011

http://hg.python.org/cpython/rev/cca6dc29a900
changeset: 69567:cca6dc29a900
branch: 3.2
parent: 69564:f393c507717a
parent: 69566:154b323e0e7f
user: Senthil Kumaran <orsenthil at gmail.com>
date: Tue Apr 26 21:00:27 2011 +0800
summary:
 merge from 3.1 codeline.
files:
 Lib/getpass.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/getpass.py b/Lib/getpass.py
--- a/Lib/getpass.py
+++ b/Lib/getpass.py
@@ -62,7 +62,7 @@
 try:
 old = termios.tcgetattr(fd) # a copy to save
 new = old[:]
- new[3] &= ~(termios.ECHO|termios.ISIG) # 3 == 'lflags'
+ new[3] &= ~termios.ECHO # 3 == 'lflags'
 tcsetattr_flags = termios.TCSAFLUSH
 if hasattr(termios, 'TCSASOFT'):
 tcsetattr_flags |= termios.TCSASOFT
-- 
Repository URL: http://hg.python.org/cpython
