Change: make worker-manager run under Python 3

Doesn't work yet, but it users Python 3 in hashbang.

2 files changed, 11 insertions, 11 deletions

diff --git a/check b/check
index d410ba0..1cca3c1 100755
--- a/check
+++ b/check
@@ -45,13 +45,13 @@ then
     ./is-agpl3+ $sources
 fi
 
-python_sources="ick_controller.py worker-manager ick2"
+python_sources="ick_controller.py worker_manager ick2"
 
 title pycodestyle
 pycodestyle ick2 $python_sources
 
 title pylint
-pylint3 --rcfile pylint.conf ick2 $python_sources
+pylint3 --rcfile pylint.conf $python_sources
 
 title Yarns
 yarn yarns/*.yarn \
diff --git a/worker-manager b/worker_manager
index 89059b9..0ba0aab 100755
--- a/worker-manager
+++ b/worker_manager
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 # Copyright 2017  Lars Wirzenius
 #
 # This program is free software: you can redistribute it and/or modify
@@ -56,7 +56,7 @@ class WorkerManager(cliapp.Application):
         self.settings.require('name')
         name = self.settings['name']
         url = self.settings['controller']
-        print 'Worker manager {} starts, controller is {}'.format(name, url)
+        print('Worker manager {} starts, controller is {}'.format(name, url))
         while True:
             work = self.get_work(url, name)
             if work and self.settings['pretend']:
@@ -68,20 +68,20 @@ class WorkerManager(cliapp.Application):
 
     def sleep_a_little(self):
         secs = self.settings['sleep']
-        print 'Sleeping for {} seconds'.format(secs)
+        print('Sleeping for {} seconds'.format(secs))
         time.sleep(secs)
 
     def get_work(self, url, name):
         get_work_url = '{}/worker/{}'.format(url, name)
-        print 'Getting work from {}'.format(get_work_url)
+        print('Getting work from {}'.format(get_work_url))
         r = requests.get(get_work_url)
         if r.status_code != 200 or not r.text:
             return None
-        print 'Response: {!r}'.format(r.text)
+        print('Response: {!r}'.format(r.text))
         return r.json()
 
     def report_pretend_work(self, url, name, work):
-        print 'Pretending to work: {!r}'.format(work)
+        print('Pretending to work: {!r}'.format(work))
         snippet_url = '{}/worker/{}/snippet'.format(url, name)
         snippet = {
             'project': work['project'],
@@ -92,7 +92,7 @@ class WorkerManager(cliapp.Application):
         self.post_snippet(snippet_url, snippet)
 
     def do_work(self, url, name, work):
-        print 'Doing work: {!r}'.format(work)
+        print('Doing work: {!r}'.format(work))
         snippet_url = '{}/worker/{}/snippet'.format(url, name)
         snippet = {
             'project': work['project'],
@@ -102,7 +102,7 @@ class WorkerManager(cliapp.Application):
         }
 
         def post(stream_name, data):
-            print '{}: {!r}'.format(stream_name, data)
+            print('{}: {!r}'.format(stream_name, data))
             s = dict(snippet)
             s[stream_name] = data
             self.post_snippet(snippet_url, s)
@@ -125,7 +125,7 @@ class WorkerManager(cliapp.Application):
         headers = {
             'Content-Type': 'application/json',
         }
-        print 'POST {} {!r}'.format(url, snippet)
+        print('POST {} {!r}'.format(url, snippet))
         r = requests.post(url, headers=headers, data=json.dumps(snippet))
         if not r.ok:
             raise cliapp.AppException(