mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 04:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Bug #1445068: getpass.getpass() can now be given an explicit stream

Browse source 
argument to specify where to write the prompt.
This commit is contained in:
Georg Brandl 2006-03-31 18:42:16 +00:00
parent 22ec80bc4f
commit 338ef7d2bd
3 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/getpass.py
View file

@ -15,11 +15,14 @@ import sys
__all__ = ["getpass","getuser"]
def unix_getpass(prompt='Password: '):
def unix_getpass(prompt='Password: ', stream=None):
"""Prompt for a password, with echo turned off.
The prompt is written on stream, by default stdout.
Restore terminal settings at end.
"""
if stream is None:
stream = sys.stdout
try:
fd = sys.stdin.fileno()
@ -32,18 +35,18 @@ def unix_getpass(prompt='Password: '):
new[3] = new[3] & ~termios.ECHO # 3 == 'lflags'
try:
termios.tcsetattr(fd, termios.TCSADRAIN, new)
passwd = _raw_input(prompt)
passwd = _raw_input(prompt, stream)
finally:
termios.tcsetattr(fd, termios.TCSADRAIN, old)
sys.stdout.write('\n')
stream.write('\n')
return passwd
def win_getpass(prompt='Password: '):
def win_getpass(prompt='Password: ', stream=None):
"""Prompt for password with echo off, using Windows getch()."""
if sys.stdin is not sys.__stdin__:
return default_getpass(prompt)
return default_getpass(prompt, stream)
import msvcrt
for c in prompt:
msvcrt.putch(c)
@ -63,17 +66,19 @@ def win_getpass(prompt='Password: '):
return pw
def default_getpass(prompt='Password: '):
print "Warning: Problem with getpass. Passwords may be echoed."
return _raw_input(prompt)
def default_getpass(prompt='Password: ', stream=None):
print >>sys.stderr, "Warning: Problem with getpass. Passwords may be echoed."
return _raw_input(prompt, stream)
def _raw_input(prompt=""):
def _raw_input(prompt="", stream=None):
# A raw_input() replacement that doesn't save the string in the
# GNU readline history.
if stream is None:
stream = sys.stdout
prompt = str(prompt)
if prompt:
sys.stdout.write(prompt)
stream.write(prompt)
line = sys.stdin.readline()
if not line:
raise EOFError