diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 15:04:59 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 15:04:59 -0800 |
| commit | 0de4b781ddc3aa749548560da78bc39c59cb2ef0 (patch) | |
| tree | f81a73f7585d7c57669f8ab2afc8125ed020a19c | |
| parent | ea8befe5fadc06f2a0d5b2c4caa472a7075faad7 (diff) | |
| parent | 25182389e6c16bf5b89540b3d3bd89ba4fb733f8 (diff) | |
Merge branch '1.13' into 1.14
| -rw-r--r-- | paramiko/util.py | 9 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 1 |
2 files changed, 1 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: diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 909320ea..e61614b2 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :support:`422` Clean up some unused imports. Courtesy of Olle Lundberg. * :bug:`266` Change numbering of `~paramiko.transport.Transport` channels to start at 0 instead of 1 for better compatibility with OpenSSH & certain server implementations which break on 1-indexed channels. Thanks to |