From 20afb137bb9fcdfd2c0f248f367c8e62a1d5c94b Mon Sep 17 00:00:00 2001 From: Dan Boehm Date: Mon, 5 Oct 2015 14:11:24 -0500 Subject: [PATCH] Fix __repr__ for python3. --- openssh_wrapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openssh_wrapper.py b/openssh_wrapper.py index 741da66..eaa0bbf 100644 --- a/openssh_wrapper.py +++ b/openssh_wrapper.py @@ -188,7 +188,7 @@ def run(self, command, interpreter='/bin/bash', forward_ssh_agent=False): if returncode == 255: # ssh client error raise SSHError("%s (under %s): %s" % ( ' '.join(ssh_command), self.user, err.strip())) - return SSHResult(command, out.strip(), err.strip(), returncode) + return SSHResult(command.encode('utf-8', 'ignore'), out.strip(), err.strip(), returncode) def scp(self, files, target, mode=None, owner=None): """ Copy files identified by their names to remote location @@ -455,7 +455,7 @@ def repr_binary(self): return b('').join(ret) def repr_text(self): - return self.repr_binary().encode('utf-8', 'ignore') + return self.repr_binary().decode('utf-8', 'ignore') class SSHError(Exception):