diff options
| author | Jeremy T. Bouse <jbouse@debian.org> | 2014-08-28 22:23:08 -0700 |
|---|---|---|
| committer | Jeremy T. Bouse <jbouse@debian.org> | 2014-08-28 22:23:08 -0700 |
| commit | 87432e7ba4c5605f96ebf90de68b5a1d39193004 (patch) | |
| tree | da54f2772c9eb6615e9702b5fdee058333fb8d44 /paramiko/py3compat.py | |
| parent | e93504a2d0a549833b9fa4f4046dfe2396467de9 (diff) | |
| parent | 588a4823436454e8968ee36ae95ff92e1cddc3f7 (diff) | |
| download | python-paramiko-87432e7ba4c5605f96ebf90de68b5a1d39193004.tar python-paramiko-87432e7ba4c5605f96ebf90de68b5a1d39193004.tar.gz | |
Merge tag 'upstream/1.14.1'
Upstream version 1.14.1
Diffstat (limited to 'paramiko/py3compat.py')
| -rw-r--r-- | paramiko/py3compat.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/paramiko/py3compat.py b/paramiko/py3compat.py index 8842b98..57c096b 100644 --- a/paramiko/py3compat.py +++ b/paramiko/py3compat.py @@ -39,6 +39,8 @@ if PY2: return s elif isinstance(s, unicode): return s.encode(encoding) + elif isinstance(s, buffer): + return s else: raise TypeError("Expected unicode or bytes, got %r" % s) @@ -49,6 +51,8 @@ if PY2: return s.decode(encoding) elif isinstance(s, unicode): return s + elif isinstance(s, buffer): + return s.decode(encoding) else: raise TypeError("Expected unicode or bytes, got %r" % s) |