summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobey Pointer <robey@lag.net>2005-07-14 02:36:30 +0000
committerRobey Pointer <robey@lag.net>2005-07-14 02:36:30 +0000
commit4c224095243b984f754cae5ee1bc0b4771d88acc (patch)
tree9013e17ef1e639440cb0f9b10e0ee81b132f6876
parentb5f0b3c7869a9614722403a03476ad7feb2a0b69 (diff)
[project @ Arch-1:robey@lag.net--2005-master-shake%paramiko--dev--1--patch-38]
fix util docs a bit
-rw-r--r--paramiko/util.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/paramiko/util.py b/paramiko/util.py
index 163fb033..82ac91c8 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -175,9 +175,9 @@ def generate_key_bytes(hashclass, salt, key, nbytes):
def load_host_keys(filename):
"""
Read a file of known SSH host keys, in the format used by openssh, and
- return a compound dict of C{hostname -> keytype ->} L{PKey}. The hostname
- may be an IP address or DNS name. The keytype will be either C{"ssh-rsa"}
- or C{"ssh-dss"}.
+ return a compound dict of C{hostname -> keytype ->} L{PKey <paramiko.pkey.PKey>}.
+ The hostname may be an IP address or DNS name. The keytype will be either
+ C{"ssh-rsa"} or C{"ssh-dss"}.
This type of file unfortunately doesn't exist on Windows, but on posix,
it will usually be stored in C{os.path.expanduser("~/.ssh/known_hosts")}.
@@ -185,7 +185,7 @@ def load_host_keys(filename):
@param filename: name of the file to read host keys from
@type filename: str
@return: dict of host keys, indexed by hostname and then keytype
- @rtype: dict(hostname, dict(keytype, L{PKey}))
+ @rtype: dict(hostname, dict(keytype, L{PKey <paramiko.pkey.PKey>}))
"""
import base64
from rsakey import RSAKey