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.

1 files changed, 5 insertions, 3 deletions

diff --git a/paramiko/ber.py b/paramiko/ber.py
index 7725f944..876347e0 100644
--- a/paramiko/ber.py
+++ b/paramiko/ber.py
@@ -88,8 +88,8 @@ class BER(object):
             return util.inflate_long(data)
         else:
             # 1: boolean (00 false, otherwise true)
-            raise BERException(
-                'Unknown ber encoding type %d (robey is lazy)' % ident)
+            msg = 'Unknown ber encoding type {:d} (robey is lazy)'
+            raise BERException(msg.format(ident))
 
     @staticmethod
     def decode_sequence(data):
@@ -125,7 +125,9 @@ class BER(object):
         elif (type(x) is list) or (type(x) is tuple):
             self.encode_tlv(0x30, self.encode_sequence(x))
         else:
-            raise BERException('Unknown type for encoding: %s' % repr(type(x)))
+            raise BERException(
+                'Unknown type for encoding: {!r}'.format(type(x))
+            )
 
     @staticmethod
     def encode_sequence(data):