diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 13:50:54 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 13:50:54 -0700 |
| commit | dd0524c2dc07892022ff187b156e10fa1f1c1716 (patch) | |
| tree | 36eb4eddd01fb5b6d00c4f40521fc16f720f11ce | |
| parent | 8c9df8ba637e222a3e9da6d365d225f9cad81f18 (diff) | |
| download | paramiko-dd0524c2dc07892022ff187b156e10fa1f1c1716.tar.gz | |
Flake8/etc tweaks re #971 in 2.x
| -rw-r--r-- | paramiko/common.py | 4 | ||||
| -rw-r--r-- | paramiko/sftp_client.py | 4 | ||||
| -rw-r--r-- | tests/test_client.py | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/paramiko/common.py b/paramiko/common.py index 8ce735d7..0012372a 100644 --- a/paramiko/common.py +++ b/paramiko/common.py @@ -20,9 +20,7 @@ Common constants and global variables. """ import logging -from paramiko.py3compat import ( - byte_chr, PY2, bytes_types, text_type, string_types, b, long, -) +from paramiko.py3compat import byte_chr, PY2, bytes_types, text_type, long MSG_DISCONNECT, MSG_IGNORE, MSG_UNIMPLEMENTED, MSG_DEBUG, \ MSG_SERVICE_REQUEST, MSG_SERVICE_ACCEPT = range(1, 7) diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py index a1ee6723..ee5ab073 100644 --- a/paramiko/sftp_client.py +++ b/paramiko/sftp_client.py @@ -28,9 +28,7 @@ from paramiko import util from paramiko.channel import Channel from paramiko.message import Message from paramiko.common import INFO, DEBUG, o777 -from paramiko.py3compat import ( - bytestring, b, u, long, string_types, bytes_types, -) +from paramiko.py3compat import bytestring, b, u, long from paramiko.sftp import ( BaseSFTP, CMD_OPENDIR, CMD_HANDLE, SFTPError, CMD_READDIR, CMD_NAME, CMD_CLOSE, SFTP_FLAG_READ, SFTP_FLAG_WRITE, SFTP_FLAG_CREATE, diff --git a/tests/test_client.py b/tests/test_client.py index 38006df0..bfdf5f81 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -35,7 +35,7 @@ import time from tests.util import test_path import paramiko -from paramiko.common import PY2, b +from paramiko.py3compat import PY2, b from paramiko.ssh_exception import SSHException |