diff options
| -rw-r--r-- | paramiko/channel.py | 2 | ||||
| -rw-r--r-- | paramiko/sftp.py | 5 | ||||
| -rw-r--r-- | paramiko/transport.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py index d5d8e97d..a4376e46 100644 --- a/paramiko/channel.py +++ b/paramiko/channel.py @@ -123,7 +123,7 @@ class Channel (object): It isn't necessary (or desirable) to call this method if you're going to exectue a single command with L{exec_command}. - @param term: the terminal type to emulate (for example, C{'vt100'}). + @param term: the terminal type to emulate (for example, C{'vt100'}) @type term: str @param width: width (in characters) of the terminal screen @type width: int diff --git a/paramiko/sftp.py b/paramiko/sftp.py index a4049c79..8d1db468 100644 --- a/paramiko/sftp.py +++ b/paramiko/sftp.py @@ -155,6 +155,7 @@ class BaseSFTP (object): return out def _send_packet(self, t, packet): + #self._log(DEBUG2, 'write: %s (len=%d)' % (CMD_NAMES.get(t, '0x%02x' % t), len(packet))) out = struct.pack('>I', len(packet) + 1) + chr(t) + packet if self.ultra_debug: self._log(DEBUG, util.format_binary(out, 'OUT: ')) @@ -166,5 +167,7 @@ class BaseSFTP (object): if self.ultra_debug: self._log(DEBUG, util.format_binary(data, 'IN: ')); if size > 0: - return ord(data[0]), data[1:] + t = ord(data[0]) + #self._log(DEBUG2, 'read: %s (len=%d)' % (CMD_NAMES.get(t), '0x%02x' % t, len(data)-1)) + return t, data[1:] return 0, '' diff --git a/paramiko/transport.py b/paramiko/transport.py index 31a5423a..95bc88da 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -1138,7 +1138,7 @@ class Transport (threading.Thread): (See the C{logging} module for more info.) SSH Channels will log to a sub-channel of the one specified. - @param name: new channel name for logging. + @param name: new channel name for logging @type name: str @since: 1.1 |