diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 14:06:38 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 14:06:38 -0700 |
commit | eb3a47f24450a3c7ceeb332ab082ec1990c4d012 (patch) | |
tree | 3d7a459ca36b5ed88cbcc727e5ee63b1f83a6de7 /paramiko/agent.py | |
parent | f5c558eaa7072cfe753564f5fbef2bd34748e6ca (diff) | |
parent | b808d5e6eb7e5cc3ab6cc71b7b25a1feb543bdfc (diff) |
Merge branch '2.0' into 976-int
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): |