diff options
| author | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
| commit | 31b2fd0709f259961253b9cdc875ce7827abaa68 (patch) | |
| tree | 863b7f1fe851d7183419916248591537a4b8b6c5 /paramiko/py3compat.py | |
| parent | bf855e6da326dba0c46f005eedc9f390c6c3b206 (diff) | |
| download | python-paramiko-31b2fd0709f259961253b9cdc875ce7827abaa68.tar python-paramiko-31b2fd0709f259961253b9cdc875ce7827abaa68.tar.gz | |
Imported Upstream version 1.16.0upstream/1.16.0upstream
Diffstat (limited to 'paramiko/py3compat.py')
| -rw-r--r-- | paramiko/py3compat.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/paramiko/py3compat.py b/paramiko/py3compat.py index 57c096b..6fafc31 100644 --- a/paramiko/py3compat.py +++ b/paramiko/py3compat.py @@ -3,7 +3,7 @@ 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'] + 'b', 'u', 'b2s', 'StringIO', 'BytesIO', 'is_callable', 'MAXSIZE', 'next', 'builtins'] PY2 = sys.version_info[0] < 3 @@ -18,6 +18,8 @@ if PY2: decodebytes = base64.decodestring encodebytes = base64.encodestring + import __builtin__ as builtins + def bytestring(s): # NOQA if isinstance(s, unicode): @@ -102,6 +104,7 @@ if PY2: else: import collections import struct + import builtins string_types = str text_type = str bytes = bytes |