diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 14:29:18 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 14:29:18 -0800 |
| commit | 92d91a0222394650d6f5943bad7059834a611826 (patch) | |
| tree | e0875935ade262e16d0a68e26d0443ad9dfddc47 /paramiko/util.py | |
| parent | c5836ad5524e52df87801ddd4f3a5187afae785f (diff) | |
| parent | 40f9b9c7bc110523f7a6c18208e2c20220c1aeb4 (diff) | |
| download | paramiko-92d91a0222394650d6f5943bad7059834a611826.tar.gz | |
Merge branch 'master' into 419-int
Diffstat (limited to 'paramiko/util.py')
| -rw-r--r-- | paramiko/util.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/paramiko/util.py b/paramiko/util.py index 2b3389a8..9befc63b 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 |