summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-26 17:50:26 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-26 17:50:26 -0800
commit9c3f2c2122cdf6bec97cf8bd1db664b20f861813 (patch)
treed480648a47e2ac65955a57c87f054b3d0e7343c2
parentde99785ef081bf6308498d621aae40d99c0d59aa (diff)
downloadparamiko-9c3f2c2122cdf6bec97cf8bd1db664b20f861813.tar.gz
ivars kinda suck
-rw-r--r--paramiko/ssh_exception.py21
1 files changed, 7 insertions, 14 deletions
diff --git a/paramiko/ssh_exception.py b/paramiko/ssh_exception.py
index 56dec86a..63ca6409 100644
--- a/paramiko/ssh_exception.py
+++ b/paramiko/ssh_exception.py
@@ -48,10 +48,9 @@ class BadAuthenticationType (AuthenticationException):
the server isn't allowing that type. (It may only allow public-key, for
example.)
- :ivar allowed_types:
+ :ivar list allowed_types:
list of allowed authentication types provided by the server (possible
values are: ``"none"``, ``"password"``, and ``"publickey"``).
- :type allowed_types: list
.. versionadded:: 1.1
"""
@@ -80,8 +79,7 @@ class ChannelException (SSHException):
"""
Exception raised when an attempt to open a new `.Channel` fails.
- :ivar code: the error code returned by the server
- :type code: int
+ :ivar int code: the error code returned by the server
.. versionadded:: 1.6
"""
@@ -94,12 +92,9 @@ class BadHostKeyException (SSHException):
"""
The host key given by the SSH server did not match what we were expecting.
- :ivar hostname: the hostname of the SSH server
- :type hostname: str
- :ivar key: the host key presented by the server
- :type key: `.PKey`
- :ivar expected_key: the host key expected
- :type expected_key: `.PKey`
+ :ivar str hostname: the hostname of the SSH server
+ :ivar PKey got_key: the host key presented by the server
+ :ivar PKey expected_key: the host key expected
.. versionadded:: 1.6
"""
@@ -114,10 +109,8 @@ class ProxyCommandFailure (SSHException):
"""
The "ProxyCommand" found in the .ssh/config file returned an error.
- :ivar command: The command line that is generating this exception.
- :type command: str
- :ivar error: The error captured from the proxy command output.
- :type error: str
+ :ivar str command: The command line that is generating this exception.
+ :ivar str error: The error captured from the proxy command output.
"""
def __init__(self, command, error):
SSHException.__init__(self,