diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2023-01-09 23:06:03 -0500 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2023-01-09 23:26:00 -0500 |
| commit | 22b5c4c18c56ab642e05b9e44f5bd842968a523b (patch) | |
| tree | 2fe3e9436ce3f15e66d1361a4563c9e03cf403d5 | |
| parent | 59cbe823919b567c588e23ca2a090d1b564b1b97 (diff) | |
Update encode/decodebytes
| -rw-r--r-- | paramiko/hostkeys.py | 2 | ||||
| -rw-r--r-- | paramiko/pkey.py | 2 | ||||
| -rw-r--r-- | tests/test_hostkeys.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index 91877c25..5ff15416 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +from base64 import encodebytes, decodebytes import binascii import os import sys @@ -28,7 +29,6 @@ else: from hashlib import sha1 from hmac import HMAC -from paramiko.py3compat import encodebytes, decodebytes from paramiko.dsskey import DSSKey from paramiko.rsakey import RSAKey diff --git a/paramiko/pkey.py b/paramiko/pkey.py index 92dc32ff..5e4a51ca 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -21,6 +21,7 @@ Common API for all public keys. """ import base64 +from base64 import encodebytes, decodebytes from binascii import unhexlify import os from hashlib import md5 @@ -37,7 +38,6 @@ from cryptography.hazmat.primitives.ciphers import algorithms, modes, Cipher from paramiko import util from paramiko.util import u, b from paramiko.common import o600 -from paramiko.py3compat import encodebytes, decodebytes from paramiko.ssh_exception import SSHException, PasswordRequiredException from paramiko.message import Message diff --git a/tests/test_hostkeys.py b/tests/test_hostkeys.py index 723ea1a5..ebcc40f5 100644 --- a/tests/test_hostkeys.py +++ b/tests/test_hostkeys.py @@ -20,12 +20,12 @@ Some unit tests for HostKeys. """ +from base64 import decodebytes from binascii import hexlify import os import unittest import paramiko -from paramiko.py3compat import decodebytes test_hosts_file = """\ |