Update to python3

1 files changed, 8 insertions, 8 deletions

diff --git a/lorry-controller-minion b/lorry-controller-minion
index 459130e..6e2affd 100755
--- a/lorry-controller-minion
+++ b/lorry-controller-minion
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2014-2019  Codethink Limited
 #
@@ -17,7 +17,7 @@
 
 
 import fcntl
-import httplib
+import http.client
 import json
 import logging
 import os
@@ -28,7 +28,7 @@ import signal
 import subprocess
 import tempfile
 import time
-import urllib
+import urllib.parse
 
 import cliapp
 
@@ -115,7 +115,7 @@ class MINION(cliapp.Application):
 
         logging.debug('Requesting job from WEBAPP (%s:%s)', host, port)
 
-        params = urllib.urlencode({
+        params = urllib.parse.urlencode({
                 'host': platform.node(),
                 'pid': os.getpid(),
                 })
@@ -159,7 +159,7 @@ class MINION(cliapp.Application):
             job_spec['path'])
 
         fd, self.temp_lorry_filename = tempfile.mkstemp()
-        os.write(fd, job_spec['text'])
+        os.write(fd, job_spec['text'].encode('utf-8'))
         os.close(fd)
 
 
@@ -237,7 +237,7 @@ class MINION(cliapp.Application):
         else:
             disk_usage = self.get_lorry_disk_usage(job_spec)
 
-        params = urllib.urlencode({
+        params = urllib.parse.urlencode({
                 'job_id': job_spec['job_id'],
                 'exit': 'no' if exit is None else exit,
                 'stdout': stdout,
@@ -262,7 +262,7 @@ class MINION(cliapp.Application):
         host = self.settings['webapp-host']
         port = int(self.settings['webapp-port'])
         timeout = self.settings['webapp-timeout']
-        conn = httplib.HTTPConnection(host, port=port, timeout=timeout)
+        conn = http.client.HTTPConnection(host, port=port, timeout=timeout)
 
         headers = {}
         if body:
@@ -274,7 +274,7 @@ class MINION(cliapp.Application):
         response_body = response.read()
         conn.close()
 
-        if response.status != httplib.OK:
+        if response.status != http.client.OK:
             raise WEBAPPError(response.status, response.reason, response_body)
 
         return response_body