Commit 81b1607b authored by Neal Norwitz's avatar Neal Norwitz

Fix 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().

Will backport.
parent cc313e32
...@@ -104,7 +104,10 @@ def getuser(): ...@@ -104,7 +104,10 @@ def getuser():
# Bind the name getpass to the appropriate function # Bind the name getpass to the appropriate function
try: try:
import termios import termios
except ImportError: # 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: try:
import msvcrt import msvcrt
except ImportError: except ImportError:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment