From: Brian Curtin <brian.curtin@gmail.com>
Date: Thu, 16 Dec 2010 03:27:11 +0000 (+0000)
Subject: Merged revisions 87306 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c76044ea0c65eee1e6e26efce6278c5fdbe22d6;p=python

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 2eb01fac3d..ce0456608e 100644
--- 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: