diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-10-13 14:49:14 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-10-13 15:39:10 -0700 |
commit | 6978c7a0b8faa683b119de3a0c096be31ac4fdc9 (patch) | |
tree | aee637e95f3f969c7a83a755beab2ac3219ad405 /paramiko | |
parent | c76406cc29935584e204e2d0a39ee51015bc7b92 (diff) | |
download | paramiko-6978c7a0b8faa683b119de3a0c096be31ac4fdc9.tar.gz |
Same issue as I ran into with invoke: somehow, Python 2.7 intersphinx no longer understands 'list' :(
Diffstat (limited to 'paramiko')
-rw-r--r-- | paramiko/file.py | 2 | ||||
-rw-r--r-- | paramiko/message.py | 4 | ||||
-rw-r--r-- | paramiko/server.py | 2 | ||||
-rw-r--r-- | paramiko/transport.py | 11 |
4 files changed, 9 insertions, 10 deletions
diff --git a/paramiko/file.py b/paramiko/file.py index a1bdafbe..df9cdac7 100644 --- a/paramiko/file.py +++ b/paramiko/file.py @@ -338,7 +338,7 @@ class BufferedFile (ClosingContextManager): after rounding up to an internal buffer size) are read. :param int sizehint: desired maximum number of bytes to read. - :returns: `list` of lines read from the file. + :returns: list of lines read from the file. """ lines = [] byte_count = 0 diff --git a/paramiko/message.py b/paramiko/message.py index f8ed6170..9af841da 100644 --- a/paramiko/message.py +++ b/paramiko/message.py @@ -187,7 +187,7 @@ class Message (object): def get_list(self): """ - Fetch a `list` of `strings <str>` from the stream. + Fetch a list of `strings <str>` from the stream. These are trivially encoded as comma-separated values in a string. """ @@ -281,7 +281,7 @@ class Message (object): a single string of values separated by commas. (Yes, really, that's how SSH2 does it.) - :param list l: list of strings to add + :param l: list of strings to add """ self.add_string(','.join(l)) return self diff --git a/paramiko/server.py b/paramiko/server.py index c80fbc97..a7117815 100644 --- a/paramiko/server.py +++ b/paramiko/server.py @@ -223,7 +223,7 @@ class ServerInterface (object): The default implementation always returns ``AUTH_FAILED``. - :param list responses: list of `str` responses from the client + :param responses: list of `str` responses from the client :return: ``AUTH_FAILED`` if the authentication fails; ``AUTH_SUCCESSFUL`` if it succeeds; ``AUTH_PARTIALLY_SUCCESSFUL`` if the interactive auth diff --git a/paramiko/transport.py b/paramiko/transport.py index 3e262716..68519f90 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1298,7 +1298,7 @@ class Transport(threading.Thread, ClosingContextManager): :param str username: the username to authenticate as :return: - `list` of auth types permissible for the next stage of + list of auth types permissible for the next stage of authentication (normally empty) :raises: @@ -1353,7 +1353,7 @@ class Transport(threading.Thread, ClosingContextManager): ``True`` if an attempt at an automated "interactive" password auth should be made if the server doesn't support normal password auth :return: - `list` of auth types permissible for the next stage of + list of auth types permissible for the next stage of authentication (normally empty) :raises: @@ -1424,7 +1424,7 @@ class Transport(threading.Thread, ClosingContextManager): an event to trigger when the authentication attempt is complete (whether it was successful or not) :return: - `list` of auth types permissible for the next stage of + list of auth types permissible for the next stage of authentication (normally empty) :raises: @@ -1482,7 +1482,7 @@ class Transport(threading.Thread, ClosingContextManager): :param callable handler: a handler for responding to server questions :param str submethods: a string list of desired submethods (optional) :return: - `list` of auth types permissible for the next stage of + list of auth types permissible for the next stage of authentication (normally empty). :raises: `.BadAuthenticationType` -- if public-key authentication isn't @@ -1532,7 +1532,6 @@ class Transport(threading.Thread, ClosingContextManager): :param bool gss_deleg_creds: Delegate credentials or not :return: list of auth types permissible for the next stage of authentication (normally empty) - :rtype: list :raises: `.BadAuthenticationType` -- if gssapi-with-mic isn't allowed by the server (and no event was passed in) :raises: @@ -1556,7 +1555,7 @@ class Transport(threading.Thread, ClosingContextManager): :param str username: The username to authenticate as. :returns: - a `list` of auth types permissible for the next stage of + a list of auth types permissible for the next stage of authentication (normally empty) :raises: `.BadAuthenticationType` -- if GSS-API Key Exchange was not performed (and no event was passed |