[Python-checkins] python/dist/src/Lib getpass.py,1.14,1.14.14.1
nnorwitz@users.sourceforge.net
nnorwitz@users.sourceforge.net
Wed, 20 Nov 2002 15:38:22 -0800
Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv27078/Lib
Modified Files:
Tag: release22-maint
getpass.py
Log Message:
Backport fix for SF #640094, on win32 getpass runs into unix_getpass
Make sure we have a UNIX-compatible termios.
Apparently, McMillan Installer made a termios on windows
which caused unix_getpass to be used instead of win_getpass
Index: getpass.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/getpass.py,v
retrieving revision 1.14
retrieving revision 1.14.14.1
diff -C2 -d -r1.14 -r1.14.14.1
*** getpass.py 30 Aug 2001 15:07:44 -0000 1.14
--- getpass.py 20 Nov 2002 23:38:20 -0000 1.14.14.1
***************
*** 105,109 ****
try:
import termios
! except ImportError:
try:
import msvcrt
--- 105,112 ----
try:
import termios
! # it's possible there is an incompatible termios from the
! # McMillan Installer, make sure we have a UNIX-compatible termios
! termios.tcgetattr, termios.tcsetattr
! except (ImportError, AttributeError):
try:
import msvcrt