summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-24 10:05:25 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-24 10:05:25 -0800
commitf76485f766339f02e81b45b12d0779555fdd0486 (patch)
treefaad16ff5e569fc66e50d6f7ea1642e05b3b0ed1
parent24cc59b64d4325a42f8992c7c916ace18bbcf960 (diff)
downloadparamiko-f76485f766339f02e81b45b12d0779555fdd0486.tar.gz
PKey docstring cleanup
-rw-r--r--paramiko/pkey.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/paramiko/pkey.py b/paramiko/pkey.py
index 21995bf9..b412f768 100644
--- a/paramiko/pkey.py
+++ b/paramiko/pkey.py
@@ -52,14 +52,14 @@ class PKey (object):
``data`` is given, the key's public part(s) will be filled in from
the string.
- :param msg: an optional SSH `.Message` containing a public key of this
- type.
+ :param msg:
+ an optional SSH `.Message` containing a public key of this type.
:type msg: `.Message`
- :param data: an optional string containing a public key of this type
- :type data: str
+ :param str data: an optional string containing a public key of this type
- :raises SSHException: if a key cannot be created from the ``data`` or
- ``msg`` given, or no key was passed in.
+ :raises SSHException:
+ if a key cannot be created from the ``data`` or ``msg`` given, or
+ no key was passed in.
"""
pass
@@ -96,8 +96,9 @@ class PKey (object):
"""
Return the name of this private key implementation.
- :return: name of this private key type, in SSH terminology (for
- example, ``"ssh-rsa"``).
+ :return:
+ name of this private key type, in SSH terminology (for example,
+ ``"ssh-rsa"``).
:rtype: str
"""
return ''