diff options
| -rw-r--r-- | paramiko/config.py | 2 | ||||
| -rw-r--r-- | sites/docs/api/config.rst | 7 | ||||
| -rw-r--r-- | tests/configs/match-final | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/paramiko/config.py b/paramiko/config.py index 938ddc6f..8ab55c64 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -218,6 +218,8 @@ class SSHConfig: Added canonicalization support. .. versionchanged:: 2.7 Added ``Match`` support. + .. versionchanged:: 3.3 + Added ``Match final`` support. """ # First pass options = self._lookup(hostname=hostname) diff --git a/sites/docs/api/config.rst b/sites/docs/api/config.rst index 19fa6f7b..9015a77c 100644 --- a/sites/docs/api/config.rst +++ b/sites/docs/api/config.rst @@ -61,8 +61,9 @@ Paramiko releases) are included. A keyword by itself means no known departures. - ``Host`` - ``HostName``: used in ``%h`` :ref:`token expansion <TOKENS>` -- ``Match``: supports (canonical, final, exec, host, originalhost, user, localuser, all), with - the following caveats: +- ``Match``: supports the keywords ``all``, ``canonical``, ``exec``, ``final``, + ``host``, ``localuser``, ``originalhost``, and ``user``, with the following + caveats: - You must have the optional dependency Invoke installed; see :ref:`the installation docs <paramiko-itself>` (in brief: install @@ -73,6 +74,8 @@ Paramiko releases) are included. A keyword by itself means no known departures. but has no knowledge about connection-time usernames. .. versionadded:: 2.7 + .. versionchanged:: 3.3 + Added support for the ``final`` keyword. - ``Port``: supplies potential values for ``%p`` :ref:`token expansion <TOKENS>`. diff --git a/tests/configs/match-final b/tests/configs/match-final index 18e48a92..21e927fc 100644 --- a/tests/configs/match-final +++ b/tests/configs/match-final @@ -1,5 +1,5 @@ Host jump - HostName jump.example.orig + HostName jump.example.org Port 1003 Host finally |