summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-24 17:43:22 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-24 17:43:22 -0800
commit6d71fbd9ef155df29be96aec69379a27d91927ed (patch)
tree96e69d0b93942e52536e3219bd758a6fbb790052
parent0bf0f08ee46aa210bd820e40a67648a34ba85cd6 (diff)
downloadparamiko-6d71fbd9ef155df29be96aec69379a27d91927ed.tar.gz
More formatting + link fixes
-rw-r--r--paramiko/transport.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 060012f3..dfcf51a7 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -420,9 +420,8 @@ class Transport (threading.Thread):
key info, not just the public half. Only one key of each type (RSA or
DSS) is kept.
- :param key: the host key to add, usually an `RSAKey <rsakey.RSAKey>` or
- `DSSKey <dsskey.DSSKey>`.
- :type key: `PKey <pkey.PKey>`
+ :param key: the host key to add, usually an `.RSAKey` or `.DSSKey`.
+ :type key: `.PKey`
"""
self.server_key_dict[key.get_name()] = key
@@ -438,7 +437,7 @@ class Transport (threading.Thread):
yet, ``None`` is returned. In client mode, the behavior is undefined.
:return: host key of the type negotiated by the client, or ``None``.
- :rtype: `PKey <pkey.PKey>`
+ :rtype: `.PKey`
"""
try:
return self.server_key_dict[self.host_key_type]
@@ -458,16 +457,16 @@ class Transport (threading.Thread):
fits certain criteria. These primes are pretty difficult to compute,
so they can't be generated on demand. But many systems contain a file
of suitable primes (usually named something like ``/etc/ssh/moduli``).
- If you call ``load_server_moduli`` and it returns ``True``, then this
+ If you call `load_server_moduli` and it returns ``True``, then this
file of primes has been loaded and we will support "group-exchange" in
server mode. Otherwise server mode will just claim that it doesn't
support that method of key negotiation.
- :param filename: optional path to the moduli file, if you happen to
- know that it's not in a standard location.
- :type filename: str
- :return: True if a moduli file was successfully loaded; False
- otherwise.
+ :param str filename:
+ optional path to the moduli file, if you happen to know that it's
+ not in a standard location.
+ :return:
+ True if a moduli file was successfully loaded; False otherwise.
:rtype: bool
.. note:: This has no effect when used in client mode.