diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 15:05:12 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 15:05:12 -0800 |
commit | 1ad893aa91512cfa4fc3b0309ca9be62f6afd627 (patch) | |
tree | ba6e22a7e4a5a143ada58e2a9230c15861998f45 /paramiko | |
parent | e07dbc9cd7dcf6ebaa9315ad9d4a44eb5ed20e5b (diff) | |
parent | 0de4b781ddc3aa749548560da78bc39c59cb2ef0 (diff) | |
download | paramiko-1ad893aa91512cfa4fc3b0309ca9be62f6afd627.tar.gz |
Merge branch '1.14' into 1.15
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'paramiko')
-rw-r--r-- | paramiko/util.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/paramiko/util.py b/paramiko/util.py index 9befc63b..d9a29d74 100644 --- a/paramiko/util.py +++ b/paramiko/util.py @@ -23,7 +23,6 @@ Useful functions used by the rest of paramiko. from __future__ import generators import array -from binascii import hexlify, unhexlify import errno import sys import struct @@ -106,14 +105,6 @@ def format_binary_line(data): return '%-50s %s' % (left, right) -def hexify(s): - return hexlify(s).upper() - - -def unhexify(s): - return unhexlify(s) - - def safe_string(s): out = b('') for c in s: |