summaryrefslogtreecommitdiff
path: root/Doc/library/getpass.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-05-12 18:05:20 +0000
committerGeorg Brandl <georg@python.org>2008-05-12 18:05:20 +0000
commite6bcc9145e3ecae592dd2e24da5508f34022b920 (patch)
tree407b0d02ac1d4e16d0d30d6b2795d4d1345201d2 /Doc/library/getpass.rst
parentc73728373c767119271e3813b3f4d182c845a297 (diff)
downloadcpython-git-e6bcc9145e3ecae592dd2e24da5508f34022b920.tar.gz
Remove many "versionchanged" items that didn't use the official markup,
but just some text embedded in the docs. Also remove paragraph about implicit relative imports from tutorial.
Diffstat (limited to 'Doc/library/getpass.rst')
-rw-r--r--Doc/library/getpass.rst13
1 files changed, 5 insertions, 8 deletions
diff --git a/Doc/library/getpass.rst b/Doc/library/getpass.rst
index 91c811beff..ff1c0916f7 100644
--- a/Doc/library/getpass.rst
+++ b/Doc/library/getpass.rst
@@ -12,11 +12,11 @@ The :mod:`getpass` module provides two functions:
.. function:: getpass([prompt[, stream]])
- Prompt the user for a password without echoing. The user is prompted using the
- string *prompt*, which defaults to ``'Password: '``. On Unix, the prompt is
- written to the file-like object *stream*. *stream* defaults to the
- controlling terminal (/dev/tty) or if that is unavailable to ``sys.stderr``
- (this argument is ignored on Windows).
+ Prompt the user for a password without echoing. The user is prompted using
+ the string *prompt*, which defaults to ``'Password: '``. On Unix, the prompt
+ is written to the file-like object *stream*. *stream* defaults to the
+ controlling terminal (:file:`/dev/tty`) or if that is unavailable to
+ ``sys.stderr`` (this argument is ignored on Windows).
If echo free input is unavailable getpass() falls back to printing
a warning message to *stream* and reading from ``sys.stdin`` and
@@ -24,9 +24,6 @@ The :mod:`getpass` module provides two functions:
Availability: Macintosh, Unix, Windows.
- .. versionchanged:: 2.6
- On Unix it defaults to using /dev/tty before falling back
- to ``sys.stdin`` and ``sys.stderr``.
.. note::
If you call getpass from within IDLE, the input may be done in the
terminal you launched IDLE from rather than the idle window itself.