summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-12-18 12:22:25 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-12-18 12:22:25 -0800
commite6c1499d7fa500f9748d41c1b180d6fbf29f6ff2 (patch)
tree1110b2cc0d529c6658de8ee94e2c6ba00f98e41e
parent7c1d29c97c2e4861953706c8d0197ad399178b86 (diff)
flake8
also sorted py3compat.__all__
-rw-r--r--paramiko/common.py2
-rw-r--r--paramiko/py3compat.py11
2 files changed, 7 insertions, 6 deletions
diff --git a/paramiko/common.py b/paramiko/common.py
index d38c4563..3a251d94 100644
--- a/paramiko/common.py
+++ b/paramiko/common.py
@@ -20,7 +20,7 @@
Common constants and global variables.
"""
import logging
-from paramiko.py3compat import byte_chr, PY2, bytes_types, text_type, long, b
+from paramiko.py3compat import byte_chr, PY2, long, b
MSG_DISCONNECT, MSG_IGNORE, MSG_UNIMPLEMENTED, MSG_DEBUG, \
MSG_SERVICE_REQUEST, MSG_SERVICE_ACCEPT = range(1, 7)
diff --git a/paramiko/py3compat.py b/paramiko/py3compat.py
index 0d888a3c..67c0f200 100644
--- a/paramiko/py3compat.py
+++ b/paramiko/py3compat.py
@@ -1,11 +1,12 @@
import sys
import base64
-__all__ = ['PY2', 'string_types', 'integer_types', 'text_type', 'bytes_types',
- 'bytes', 'long', 'input', 'decodebytes', 'encodebytes',
- 'bytestring', 'byte_ord', 'byte_chr', 'byte_mask', 'b', 'u', 'b2s',
- 'StringIO', 'BytesIO', 'is_callable', 'MAXSIZE',
- 'next', 'builtins']
+__all__ = [
+ 'BytesIO', 'MAXSIZE', 'PY2', 'StringIO', 'b', 'b2s', 'builtins',
+ 'byte_chr', 'byte_mask', 'byte_ord', 'bytes', 'bytes_types', 'decodebytes',
+ 'encodebytes', 'input', 'integer_types', 'is_callable', 'long', 'next',
+ 'string_types', 'text_type', 'u',
+]
PY2 = sys.version_info[0] < 3