summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-03-18 21:23:26 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-03-18 21:23:26 -0400
commit29d1acda68dff4ccb8deb0f003c450bdfdc37293 (patch)
tree0d0b189f98d5fd33887b471353c3c826346e81ba
parent339be6941e8e2b83cff1d3542acd13ec1f11c457 (diff)
Make sure we pass a str under py3k
-rw-r--r--paramiko/pkey.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/pkey.py b/paramiko/pkey.py
index b21a867c..72afa6fe 100644
--- a/paramiko/pkey.py
+++ b/paramiko/pkey.py
@@ -346,4 +346,4 @@ class PKey(object):
serialization.Encoding.PEM,
format,
encryption
- ))
+ ).decode())