summaryrefslogtreecommitdiff
path: root/paramiko/util.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-12-17 15:04:59 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-12-17 15:04:59 -0800
commit0de4b781ddc3aa749548560da78bc39c59cb2ef0 (patch)
treef81a73f7585d7c57669f8ab2afc8125ed020a19c /paramiko/util.py
parentea8befe5fadc06f2a0d5b2c4caa472a7075faad7 (diff)
parent25182389e6c16bf5b89540b3d3bd89ba4fb733f8 (diff)
downloadparamiko-0de4b781ddc3aa749548560da78bc39c59cb2ef0.tar.gz
Merge branch '1.13' into 1.14
Diffstat (limited to 'paramiko/util.py')
-rw-r--r--paramiko/util.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/paramiko/util.py b/paramiko/util.py
index ab1bb98d..6b462778 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: