summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRed_M <1468433+Red-M@users.noreply.github.com>2018-04-10 02:31:14 +1000
committerGitHub <noreply@github.com>2018-04-10 02:31:14 +1000
commit70027ab5b40f3d74c58b05779e55511d3ae16ef6 (patch)
tree3edd321879ca8c15bf468a4c580e1ab5f872558c
parentdf1d14fb2d70db2810a4c60266bf569bf82d2d6e (diff)
parent7f8056321dda5d4f81b49e8bc42ebf8598d0230e (diff)
downloadpexpect-70027ab5b40f3d74c58b05779e55511d3ae16ef6.tar.gz
Merge branch 'master' into master
-rw-r--r--doc/history.rst22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/history.rst b/doc/history.rst
index 4041b7d..d769e87 100644
--- a/doc/history.rst
+++ b/doc/history.rst
@@ -7,29 +7,29 @@ Releases
Version 4.5
```````````
-* :class:`~.spawn` + `~.fdspawn` now have an ``use_poll`` parameter.
+* :class:`~.spawn` + :class:`~.fdspawn` now have an ``use_poll`` parameter.
This change allows the use of select.poll() on file descriptors.
It allows for > 1024 file descriptors on the system, and, it is not used by
default due to compatibility concerns and must be explicitly enabled.
* :mod:`pexpect.pxssh` now has several new options in :meth:`pxssh.pxssh.login`.
-* :meth:`pxssh.pxssh.login` has `password_regex` which allows changing the password
- prompt regex for servers that include ``password:`` somewhere before a command
- line is reached.(:ghpull:`468`)
+* :meth:`pxssh.pxssh.login` has the option ``password_regex`` which allows changing
+ the password prompt regex for servers that include ``password:`` somewhere before a
+ command line is reached.(:ghpull:`468`)
* :meth:`pxssh.pxssh.login` now allows for setting up SSH tunnels to be requested once
- logged in to the rmeote server. (:ghpull:`473`)
+ logged in to the remote server. This option is ``ssh_tunnels`` (:ghpull:`473`)
The structure should be like this::
{ 'local': ['2424:localhost:22'], # Local SSH tunnels
'remote': ['2525:localhost:22'], # Remote SSH tunnels
'dynamic': [8888] } # Dynamic/SOCKS tunnels
-* :meth:`pxssh.pxssh.login` allows subsequent logins from the remote session and treats
- the session as if it was local. (:ghpull:`472`)
-* :meth:`pxssh.pxssh.login` can allow the the prompt to not be set to something unique
- incase the remote server is sensetive to new lines at login. (:ghpull:`468`)
-* :meth:`pxssh.pxssh.login` has had a change with an SSH key being provided which is
+* :meth:`pxssh.pxssh.login` ``spawn_local_ssh`` allows subsequent logins from the remote session and treats
+ the session as if it was local. Simply set this to ``False``. (:ghpull:`472`)
+* :meth:`pxssh.pxssh.login` ``sync_original_prompt`` can allow the prompt to not be set to something unique
+ incase the remote server is sensetive to new lines at login. Set this to ``False`` to do so. (:ghpull:`468`)
+* :meth:`pxssh.pxssh.login` has had a change with the SSH key option, which is
if ``ssh_key`` is set to ``True`` then the SSH client forces forwarding the authentication
- agent to the remote server. (:ghpull:`473`)
+ agent to the remote server instead of providing a key. (:ghpull:`473`)
Version 4.4
```````````