summaryrefslogtreecommitdiff
path: root/paramiko/util.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-11-12 13:54:01 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-11-12 13:54:01 -0800
commitb3d703e984f2046f8eb208e3c82f8bf5c7c49d6a (patch)
tree399c6eb788629bc6c78b75933703869a214043db /paramiko/util.py
parenta08149d5f7aea1fcce55223a000ce9018df02961 (diff)
downloadparamiko-b3d703e984f2046f8eb208e3c82f8bf5c7c49d6a.tar.gz
Improve byte/string interactions in debug logging.
Fixes #429
Diffstat (limited to 'paramiko/util.py')
-rw-r--r--paramiko/util.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/paramiko/util.py b/paramiko/util.py
index dbcbbae4..542bb218 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -115,12 +115,13 @@ def unhexify(s):
def safe_string(s):
- out = ''
+ out = b('')
for c in s:
- if (byte_ord(c) >= 32) and (byte_ord(c) <= 127):
- out += c
+ i = byte_ord(c)
+ if 32 <= i <= 127:
+ out += byte_chr(i)
else:
- out += '%%%02X' % byte_ord(c)
+ out += b('%%%02X' % i)
return out