diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-12-16 03:27:11 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-12-16 03:27:11 (GMT) |
| commit | 1c76044ea0c65eee1e6e26efce6278c5fdbe22d6 (patch) | |
| tree | 0866a87590b3c72715e1ca0ed1fc2df0e7a0f1ec /Lib/getpass.py | |
| parent | 3efdf0630b9c809dd775039917fb2556a82d14f2 (diff) | |
| download | cpython-1c76044ea0c65eee1e6e26efce6278c5fdbe22d6.zip cpython-1c76044ea0c65eee1e6e26efce6278c5fdbe22d6.tar.gz cpython-1c76044ea0c65eee1e6e26efce6278c5fdbe22d6.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/getpass.py')
| -rw-r--r-- | Lib/getpass.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Lib/getpass.py b/Lib/getpass.py index 2eb01fa..ce04566 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: |