diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-05 23:03:36 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-05 23:03:36 -0700 |
commit | eb23d3cf359987e6e18f521d11a3b35b9c450f7d (patch) | |
tree | 87d88051a64476996375e91f2a66ad3d71632d42 /paramiko/agent.py | |
parent | b14d98e506879e6c3521c6549a3f8b9abd234fda (diff) | |
parent | fd94765e54272706b55e50c692c814d07c8008d1 (diff) |
Merge branch '2.0' into 2.1
Diffstat (limited to 'paramiko/agent.py')
-rw-r--r-- | paramiko/agent.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/agent.py b/paramiko/agent.py index a7cab4d8..bc857efa 100644 --- a/paramiko/agent.py +++ b/paramiko/agent.py @@ -253,7 +253,7 @@ class AgentServerProxy(AgentSSH): """ :param .Transport t: Transport used for SSH Agent communication forwarding - :raises SSHException: mostly if we lost the agent + :raises: `.SSHException` -- mostly if we lost the agent """ def __init__(self, t): AgentSSH.__init__(self) @@ -347,7 +347,7 @@ class Agent(AgentSSH): opened, if one is running. If no agent is running, initialization will succeed, but `get_keys` will return an empty tuple. - :raises SSHException: + :raises: `.SSHException` -- if an SSH agent is found, but speaks an incompatible protocol """ def __init__(self): |