From 588a4823436454e8968ee36ae95ff92e1cddc3f7 Mon Sep 17 00:00:00 2001 From: "Jeremy T. Bouse" Date: Thu, 28 Aug 2014 22:23:07 -0700 Subject: Imported Upstream version 1.14.1 --- paramiko/py3compat.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'paramiko/py3compat.py') 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) -- cgit v1.2.3