From 22b5c4c18c56ab642e05b9e44f5bd842968a523b Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 9 Jan 2023 23:06:03 -0500 Subject: Update encode/decodebytes --- paramiko/hostkeys.py | 2 +- paramiko/pkey.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'paramiko') 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 -- cgit v1.2.1