summaryrefslogtreecommitdiffhomepage
path: root/paramiko/agent.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-09 13:56:15 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-09 13:56:15 -0700
commitdb536221784e281d5452bf0d6346e2d2a86affbd (patch)
tree0599cd77475b6a0f93eb73cf6bec2e71b3c523ae /paramiko/agent.py
parentf5c558eaa7072cfe753564f5fbef2bd34748e6ca (diff)
parent22439d24a7a304cf6f9e2f97b934000f5908664e (diff)
Merge branch '2.0' into 976-int
Diffstat (limited to 'paramiko/agent.py')
-rw-r--r--paramiko/agent.py4
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):