Update to python3

1 files changed, 10 insertions, 12 deletions

diff --git a/lorry-controller-remove-old-jobs b/lorry-controller-remove-old-jobs
index 2a54a30..fcd8b38 100755
--- a/lorry-controller-remove-old-jobs
+++ b/lorry-controller-remove-old-jobs
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
-# Copyright (C) 2014  Codethink Limited
+# Copyright (C) 2014-2019  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,8 +19,7 @@
 import json
 import logging
 import time
-import urllib2
-import urlparse
+import urllib.request, urllib.error, urllib.parse
 import contextlib
 
 import cliapp
@@ -78,12 +77,12 @@ class OldJobRemover(cliapp.Application):
 
     def list_jobs(self):
         data = self.get('/1.0/list-jobs')
-        obj = json.loads(data)
+        obj = json.loads(data.decode('utf-8'))
         return obj['job_ids']
 
     def get(self, path):
         url = self.make_url(path)
-        with contextlib.closing(urllib2.urlopen(url)) as f:
+        with urllib.request.urlopen(url) as f:
             return f.read()
 
     def make_url(self, path):
@@ -93,14 +92,14 @@ class OldJobRemover(cliapp.Application):
         query = None
         fragment = None
         parts = (scheme, netloc, path, query, fragment)
-        return urlparse.urlunsplit(parts)
+        return urllib.parse.urlunsplit(parts)
 
     def get_job_infos(self, job_ids):
         job_infos = []
         for job_id in job_ids:
             try:
                 job_infos.append(self.get_job_info(job_id))
-            except urllib2.HTTPError as e:
+            except urllib.error.HTTPError as e:
                 logging.warning(
                     'Trouble getting job info for job %s: %s' %
                     (job_id, str(e)))
@@ -108,7 +107,7 @@ class OldJobRemover(cliapp.Application):
 
     def get_job_info(self, job_id):
         data = self.get('/1.0/job/%s' % job_id)
-        obj = json.loads(data)
+        obj = json.loads(data.decode('utf-8'))
         exit_code = obj['exit']
         if obj['job_ended']:
             exit_timestamp = self.parse_timestamp(obj['job_ended'])
@@ -144,9 +143,8 @@ class OldJobRemover(cliapp.Application):
 
     def post(self, path, data):
         url = self.make_url(path)
-        f = urllib2.urlopen(url, data)
-        result = f.read()
-        f.close()
+        with urllib.request.urlopen(url, data.encode('utf-8')) as f:
+            result = f.read()
 
 
 OldJobRemover().run()