More string format updates

1 files changed, 7 insertions, 4 deletions

diff --git a/paramiko/util.py b/paramiko/util.py
index de099c0c..b056c20a 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -102,9 +102,12 @@ def format_binary(data, prefix=''):
 
 
 def format_binary_line(data):
-    left = ' '.join(['%02X' % byte_ord(c) for c in data])
-    right = ''.join([('.%c..' % c)[(byte_ord(c) + 63) // 95] for c in data])
-    return '%-50s %s' % (left, right)
+    left = ' '.join(['{:02X}'.format(byte_ord(c)) for c in data])
+    right = ''.join([
+        '.{:c}..'.format(byte_ord(c))[(byte_ord(c) + 63) // 95]
+        for c in data
+    ])
+    return '{:50s} {}'.format(left, right)
 
 
 def safe_string(s):
@@ -114,7 +117,7 @@ def safe_string(s):
         if 32 <= i <= 127:
             out += byte_chr(i)
         else:
-            out += b('%%%02X' % i)
+            out += b('%{:02X}'.format(i))
     return out