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 | |
| parent | e07dbc9cd7dcf6ebaa9315ad9d4a44eb5ed20e5b (diff) | |
| parent | 0de4b781ddc3aa749548560da78bc39c59cb2ef0 (diff) | |
Merge branch '1.14' into 1.15
Conflicts:
sites/www/changelog.rst
| -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 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: diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index de432870..1c312ba2 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. * :support:`421` Modernize threading calls to user newer API. Thanks to Olle Lundberg. * :support:`419` Modernize a bunch of the codebase internals to leverage |