summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--paramiko/config.py3
-rw-r--r--tests/test_pkey.py3
-rw-r--r--tests/test_sftp.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/paramiko/config.py b/paramiko/config.py
index 081d0d68..21e72b20 100644
--- a/paramiko/config.py
+++ b/paramiko/config.py
@@ -28,10 +28,9 @@ import re
import shlex
import socket
from hashlib import sha1
+from io import StringIO
from functools import partial
-from .py3compat import StringIO
-
invoke, invoke_import_error = None, None
try:
import invoke
diff --git a/tests/test_pkey.py b/tests/test_pkey.py
index bc1503ab..45d1ee96 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -26,6 +26,7 @@ import os
import stat
from binascii import hexlify
from hashlib import md5
+from io import StringIO
from paramiko import (
RSAKey,
@@ -36,7 +37,7 @@ from paramiko import (
util,
SSHException,
)
-from paramiko.py3compat import StringIO, b, bytes, PY2
+from paramiko.py3compat import b, bytes, PY2
from paramiko.common import o600, byte_chr
from cryptography.exceptions import UnsupportedAlgorithm
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index b53ece7d..98292d26 100644
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -28,11 +28,11 @@ import socket
import sys
import warnings
from binascii import hexlify
+from io import StringIO
from tempfile import mkstemp
import pytest
-from paramiko.py3compat import PY2, b, u, StringIO
from paramiko.common import o777, o600, o666, o644
from tests import requireNonAsciiLocale
from paramiko.sftp_attr import SFTPAttributes