diff --git a/paramiko/channel.py b/paramiko/channel.py index 4e9a6e7..0b25448 100644 --- a/paramiko/channel.py +++ b/paramiko/channel.py @@ -336,8 +336,6 @@ class Channel (object): @return: the ID of this channel. @rtype: int - - @since: ivysaur """ return self.chanid diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py index 3fcdee4..b3914b4 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -152,8 +152,6 @@ class DSSKey (PKey): @type progress_func: function @return: new private key @rtype: L{DSSKey} - - @since: fearow """ randpool.stir() dsa = DSA.generate(bits, randpool.get_bytes, progress_func) diff --git a/paramiko/pkey.py b/paramiko/pkey.py index 4823f94..0d00f7e 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -139,8 +139,6 @@ class PKey (object): @return: a base64 string containing the public part of the key. @rtype: str - - @since: fearow """ return base64.encodestring(str(self)).replace('\n', '') @@ -194,8 +192,6 @@ class PKey (object): @raise PasswordRequiredException: if the private key file is encrypted, and C{password} is C{None}. @raise SSHException: if the key file is invalid. - - @since: fearow """ key = cls(filename=filename, password=password) return key @@ -213,8 +209,6 @@ class PKey (object): @raise IOError: if there was an error writing the file. @raise SSHException: if the key is invalid. - - @since: fearow """ raise Exception('Not implemented in PKey') diff --git a/paramiko/rsakey.py b/paramiko/rsakey.py index e94b6f2..e146d4c 100644 --- a/paramiko/rsakey.py +++ b/paramiko/rsakey.py @@ -128,8 +128,6 @@ class RSAKey (PKey): @type progress_func: function @return: new private key @rtype: L{RSAKey} - - @since: fearow """ randpool.stir() rsa = RSA.generate(bits, randpool.get_bytes, progress_func) diff --git a/paramiko/server.py b/paramiko/server.py index b59f31b..3f08e47 100644 --- a/paramiko/server.py +++ b/paramiko/server.py @@ -443,8 +443,6 @@ class SubsystemHandler (threading.Thread): authenticated and requests subsytem C{"mp3"}, an object of class C{MP3Handler} will be created, and L{start_subsystem} will be called on it from a new thread. - - @since: ivysaur """ def __init__(self, channel, name, server): """ diff --git a/paramiko/transport.py b/paramiko/transport.py index c10a776..1665154 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -74,8 +74,6 @@ class SecurityOptions (object): If you try to add an algorithm that paramiko doesn't recognize, C{ValueError} will be raised. If you try to assign something besides a tuple to one of the fields, C{TypeError} will be raised. - - @since: ivysaur """ __slots__ = [ 'ciphers', 'digests', 'key_types', 'kex', 'compression', '_transport' ] @@ -331,7 +329,7 @@ class Transport (threading.Thread): use the connection (without corrupting the session). Use this method to clean up a Transport object without disrupting the other process. - @since: 1.6 + @since: 1.5.3 """ self.sock.close() self.close() @@ -345,8 +343,6 @@ class Transport (threading.Thread): @return: an object that can be used to change the preferred algorithms for encryption, digest (hash), public key, and key exchange. @rtype: L{SecurityOptions} - - @since: ivysaur """ return SecurityOptions(self) @@ -522,8 +518,6 @@ class Transport (threading.Thread): @return: True if a moduli file was successfully loaded; False otherwise. @rtype: bool - - @since: doduo @note: This has no effect when used in client mode. """ @@ -678,8 +672,6 @@ class Transport (threading.Thread): @param bytes: the number of random bytes to send in the payload of the ignored packet -- defaults to a random number from 10 to 41. @type bytes: int - - @since: fearow """ m = Message() m.add_byte(chr(MSG_IGNORE)) @@ -723,8 +715,6 @@ class Transport (threading.Thread): @param interval: seconds to wait before sending a keepalive packet (or 0 to disable keepalives). @type interval: int - - @since: fearow """ self.packetizer.set_keepalive(interval, lambda x=weakref.proxy(self): x.global_request('keepalive@lag.net', wait=False)) @@ -746,8 +736,6 @@ class Transport (threading.Thread): request was successful (or an empty L{Message} if C{wait} was C{False}); C{None} if the request was denied. @rtype: L{Message} - - @since: fearow """ if wait: self.completion_event = threading.Event() @@ -829,8 +817,6 @@ class Transport (threading.Thread): @raise SSHException: if the SSH2 negotiation fails, the host key supplied by the server is incorrect, or authentication fails. - - @since: doduo """ if hostkey is not None: self._preferred_keys = [ hostkey.get_name() ] @@ -918,8 +904,6 @@ class Transport (threading.Thread): @return: username that was authenticated, or C{None}. @rtype: string - - @since: fearow """ if not self.active or (self.auth_handler is None): return None