Merged revisions 87306 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87306 | brian.curtin | 2010-12-15 21:24:49 -0600 (Wed, 15 Dec 2010) | 2 lines

  EasyDialogs was removed in 3.x. fallback_getpass will always be the answer here.
........

diff --git a/Lib/getpass.py b/Lib/getpass.py
index 2eb01fac3daf03c44cde5767b7af832609ea4970..ce0456608e720197c9663d94ded2c8b48955db4c 100644 (file)
--- a/Lib/getpass.py
+++ b/Lib/getpass.py
@@ -166,12 +166,7 @@ except (ImportError, AttributeError):
     try:
         import msvcrt
     except ImportError:
-        try:
-            from EasyDialogs import AskPassword
-        except ImportError:
-            getpass = fallback_getpass
-        else:
-            getpass = AskPassword
+        getpass = fallback_getpass
     else:
         getpass = win_getpass
 else: