Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ParamikoSSHClient.run() so that it works in Python 3.4.1 #347

Closed
wants to merge 1 commit into from
Closed

Fix ParamikoSSHClient.run() so that it works in Python 3.4.1 #347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libcloud/compute/ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ def run(self, cmd, timeout=None):
data = chan.recv(CHUNK_SIZE)

while data:
stdout.write(data)
stdout.write(data.decode("utf-8"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

Only thing I would do is wrap data with libcloud.utils.py3 with b function call to be on the safe side and make sure that type of data is in fact bytes in Python 3 (if for some reason, data is not bytes in Python 3, decode call will throw).

I'll go ahead and make this change.

ready = chan.recv_ready()

if not ready:
Expand All @@ -376,7 +376,7 @@ def run(self, cmd, timeout=None):
data = chan.recv_stderr(CHUNK_SIZE)

while data:
stderr.write(data)
stderr.write(data.decode("utf-8"))
ready = chan.recv_stderr_ready()

if not ready:
Expand Down