Be nicer to systems that have neither termios nor msvcrt.

diff --git a/Lib/getpass.py b/Lib/getpass.py
index 44e78c264be2e145ddea47b155a93a204ad57681..8bd75233f139f4de1db0c4d9d2fb2ccaab5b3d63 100644 (file)
--- a/Lib/getpass.py
+++ b/Lib/getpass.py
@@ -22,7 +22,12 @@ def getpass(prompt='Password: '):
        try:
                import termios, TERMIOS
        except ImportError:
-               return win_getpass(prompt)
+               try:
+                       import msvcrt
+               except ImportError:
+                       return default_getpass(prompt)
+               else:
+                       return win_getpass(prompt)
 
        fd = sys.stdin.fileno()
        old = termios.tcgetattr(fd)     # a copy to save
@@ -59,6 +64,10 @@ def win_getpass(prompt='Password: '):
        return pw
 
 
+def default_getpass(prompt='Password: '):
+       return raw_input(prompt)
+
+
 def getuser():
        """Get the username from the environment or password database.