diff --git a/paramiko/channel.py b/paramiko/channel.py index 8099c66..f6cffd6 100644 --- a/paramiko/channel.py +++ b/paramiko/channel.py @@ -490,6 +490,8 @@ class Channel (object): @return: C{True} if a L{recv_stderr} call on this channel would immediately return at least one byte; C{False} otherwise. @rtype: boolean + + @since: 1.1 """ self.lock.acquire() try: @@ -515,6 +517,8 @@ class Channel (object): @raise socket.timeout: if no data is ready before the timeout set by L{settimeout}. + + @since: 1.1 """ out = '' self.lock.acquire() @@ -653,6 +657,8 @@ class Channel (object): @return: object which can be used for python file I/O. @rtype: L{ChannelFile} + + @since: 1.1 """ return ChannelStderrFile(*([self] + list(params))) diff --git a/paramiko/sftp_server.py b/paramiko/sftp_server.py index 11f12c8..7cf7e2b 100644 --- a/paramiko/sftp_server.py +++ b/paramiko/sftp_server.py @@ -97,7 +97,7 @@ class SFTPServer (BaseSFTP, SubsystemHandler): @param e: an errno code, as from C{OSError.errno}. @type e: int - @return: an SFTP error code like L{SFTP_NO_SUCH_fILE}. + @return: an SFTP error code like L{SFTP_NO_SUCH_FILE}. @rtype: int """ if e == errno.EACCES: