diff options
author | Jeff Quast <contact@jeffquast.com> | 2014-11-24 20:00:09 -0800 |
---|---|---|
committer | Jeff Quast <contact@jeffquast.com> | 2014-11-24 20:00:09 -0800 |
commit | 6c6647b33d21e4db7ea94fc780d749ab1c29f0b4 (patch) | |
tree | 72583676493804267d7c0d948a46980a85273528 /doc | |
parent | 3ba6f75588be9216277179155c59d76a6273c64f (diff) | |
parent | 4382f40f69eb7bdd84f0b46282f2cbbb65c5552b (diff) | |
download | pexpect-git-6c6647b33d21e4db7ea94fc780d749ab1c29f0b4.tar.gz |
Merge remote-tracking branch 'origin/master' into doc-and-test-max-canon
Conflicts:
pexpect/__init__.py
tests/test_misc.py
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/pxssh.rst | 4 | ||||
-rw-r--r-- | doc/commonissues.rst | 2 | ||||
-rw-r--r-- | doc/history.rst | 14 | ||||
-rw-r--r-- | doc/overview.rst | 2 |
4 files changed, 20 insertions, 2 deletions
diff --git a/doc/api/pxssh.rst b/doc/api/pxssh.rst index 0b67839..b947f4b 100644 --- a/doc/api/pxssh.rst +++ b/doc/api/pxssh.rst @@ -23,6 +23,10 @@ pxssh class server to ask for a password. Note that the sysadmin can disable password logins, in which case this won't work. + .. attribute:: options + + The dictionary of user specified SSH options, eg, ``options = dict(StrictHostKeyChecking="no", UserKnownHostsFile="/dev/null")`` + .. automethod:: login .. automethod:: logout .. automethod:: prompt diff --git a/doc/commonissues.rst b/doc/commonissues.rst index 67985d0..b411ebb 100644 --- a/doc/commonissues.rst +++ b/doc/commonissues.rst @@ -89,7 +89,7 @@ sometimes will not allow TTY password authentication. For example, you may expect SSH to ask you for a password using code like this:: child = pexpect.spawn('ssh user@example.com') - child.expect('assword') + child.expect('password') child.sendline('mypassword') You may see the following error come back from a spawned child SSH:: diff --git a/doc/history.rst b/doc/history.rst index 0da6c6e..ec1c9c3 100644 --- a/doc/history.rst +++ b/doc/history.rst @@ -4,6 +4,20 @@ History Releases -------- +Version 4.0 +``````````` + +* Integration with :mod:`asyncio`: passing ``async=True`` to :meth:`~.expect`, + :meth:`~.expect_exact` or :meth:`~.expect_list` will make them return a + coroutine. You can get the result using ``yield from``, or wrap it in an + :class:`asyncio.Task`. This allows the event loop to do other things while + waiting for output that matches a pattern. + +Version 3.4 +``````````` +* Fixed regression when executing pexpect with some prior releases of + the multiprocessing module where stdin has been closed (:ghissue:`86`). + Version 3.3 ``````````` diff --git a/doc/overview.rst b/doc/overview.rst index 133767f..a04e389 100644 --- a/doc/overview.rst +++ b/doc/overview.rst @@ -17,7 +17,7 @@ Here is an example of Pexpect in action:: child.expect('ftp> ') child.sendline('lcd /tmp') child.expect('ftp> ') - child.sendline('cd pub') + child.sendline('cd pub/OpenBSD') child.expect('ftp> ') child.sendline('get README') child.expect('ftp> ') |