Merge lp:~fo0bar/turku/turku-agent-encoding into lp:turku/turku-agent

[Ryan Finnie]

Move encoding from writes to opens

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

Code changes look good. Looks like turku-agent has already switched to Python3, so no worries with Python2 compatibility.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 53

=== modified file 'turku_agent/ping.py'
--- turku_agent/ping.py	2019-04-22 01:39:55 +0000
+++ turku_agent/ping.py	2020-03-23 22:52:07 +0000
@@ -40,9 +40,9 @@
 
 def call_ssh(config, storage, ssh_req):
     # Write the server host public key
-    t = tempfile.NamedTemporaryFile()
+    t = tempfile.NamedTemporaryFile(mode='w+', encoding='UTF-8')
     for key in storage['ssh_ping_host_keys']:
-        t.write(('%s %s\n' % (storage['ssh_ping_host'], key)).encode('UTF-8'))
+        t.write('%s %s\n' % (storage['ssh_ping_host'], key))
     t.flush()
 
     # Call ssh
@@ -60,10 +60,10 @@
         storage['ssh_ping_host'],
         'turku-ping-remote',
     ]
-    p = subprocess.Popen(ssh_command, stdin=subprocess.PIPE)
+    p = subprocess.Popen(ssh_command, stdin=subprocess.PIPE, encoding='UTF-8')
 
     # Write the ssh request
-    p.stdin.write((json.dumps(ssh_req) + '\n.\n').encode('UTF-8'))
+    p.stdin.write(json.dumps(ssh_req) + '\n.\n')
     p.stdin.flush()
 
     # Wait for the server to close the SSH connection