diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-10-10 18:24:34 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-10-10 18:24:38 -0700 |
| commit | 29ac57f565ac94021dee46b365daa56a3d27333e (patch) | |
| tree | dda22abe6f5eba8118b225c55fac2f7a09237e4e /paramiko/packet.py | |
| parent | 9019b25497c2b143e06da6a393e24b67bfc848f0 (diff) | |
| download | paramiko-29ac57f565ac94021dee46b365daa56a3d27333e.tar.gz | |
String format modernization, part 11070-remove-python26-and-33
Choosing to skip it in some edge/corner cases where it's more harmful
than helpful. Also choosing to replace many non-%s specifiers with
regular old {} since I don't see why one would normally care. Again,
eschewing that in spots where it seems like it might matter.
Diffstat (limited to 'paramiko/packet.py')
| -rw-r--r-- | paramiko/packet.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/paramiko/packet.py b/paramiko/packet.py index 95a26c6e..840a59a7 100644 --- a/paramiko/packet.py +++ b/paramiko/packet.py @@ -368,7 +368,7 @@ class Packetizer (object): if cmd in MSG_NAMES: cmd_name = MSG_NAMES[cmd] else: - cmd_name = '$%x' % cmd + cmd_name = '${:x}'.format(cmd) orig_len = len(data) self.__write_lock.acquire() try: @@ -378,7 +378,8 @@ class Packetizer (object): if self.__dump_packets: self._log( DEBUG, - 'Write packet <%s>, length %d' % (cmd_name, orig_len)) + 'Write packet <{}>, length {}'.format(cmd_name, orig_len) + ) self._log(DEBUG, util.format_binary(packet, 'OUT: ')) if self.__block_engine_out is not None: out = self.__block_engine_out.update(packet) @@ -404,8 +405,9 @@ class Packetizer (object): ) if sent_too_much and not self.__need_rekey: # only ask once for rekeying - self._log(DEBUG, 'Rekeying (hit %d packets, %d bytes sent)' % - (self.__sent_packets, self.__sent_bytes)) + self._log(DEBUG, 'Rekeying (hit {} packets, {} bytes sent)'.format( + self.__sent_packets, self.__sent_bytes, + )) self.__received_bytes_overflow = 0 self.__received_packets_overflow = 0 self._trigger_rekey() @@ -456,7 +458,8 @@ class Packetizer (object): if self.__dump_packets: self._log( DEBUG, - 'Got payload (%d bytes, %d padding)' % (packet_size, padding)) + 'Got payload ({} bytes, {} padding)'.format(packet_size, padding), + ) if self.__compress_engine_in is not None: payload = self.__compress_engine_in(payload) @@ -483,8 +486,9 @@ class Packetizer (object): elif (self.__received_packets >= self.REKEY_PACKETS) or \ (self.__received_bytes >= self.REKEY_BYTES): # only ask once for rekeying - self._log(DEBUG, 'Rekeying (hit %d packets, %d bytes received)' % - (self.__received_packets, self.__received_bytes)) + self._log(DEBUG, 'Rekeying (hit {} packets, {} bytes received)'.format( + self.__received_packets, self.__received_bytes, + )) self.__received_bytes_overflow = 0 self.__received_packets_overflow = 0 self._trigger_rekey() @@ -493,11 +497,12 @@ class Packetizer (object): if cmd in MSG_NAMES: cmd_name = MSG_NAMES[cmd] else: - cmd_name = '$%x' % cmd + cmd_name = '${:x}'.format(cmd) if self.__dump_packets: self._log( DEBUG, - 'Read packet <%s>, length %d' % (cmd_name, len(payload))) + 'Read packet <{}>, length {}'.format(cmd_name, len(payload)) + ) return cmd, msg # ...protected... |