From 19b2ecb6ca6afcc543356a4a9115a2560feff3bb Mon Sep 17 00:00:00 2001
From: Andrew Hamilton <and_hamilton@yahoo.com>
Date: Sat, 2 Sep 2017 11:53:42 +0100
Subject: [PATCH] Coding style.

- Using new async and await keywords.
---
 vigil/fill3.py  |  5 ++---
 vigil/tools.py  |  5 ++---
 vigil/worker.py | 21 +++++++++------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/vigil/fill3.py b/vigil/fill3.py
index b185774..00ef0bf 100644
--- a/vigil/fill3.py
+++ b/vigil/fill3.py
@@ -445,10 +445,9 @@ def _urwid_screen():
         screen.stop()
 
 
-@asyncio.coroutine
-def _update_screen(screen_widget, appearance_changed_event):
+async def _update_screen(screen_widget, appearance_changed_event):
     while True:
-        yield from appearance_changed_event.wait()
+        await appearance_changed_event.wait()
         appearance_changed_event.clear()
         patch_screen(screen_widget)
 
diff --git a/vigil/tools.py b/vigil/tools.py
index ac55b85..805deea 100644
--- a/vigil/tools.py
+++ b/vigil/tools.py
@@ -760,8 +760,7 @@ class Result:
         self.status = status
         self.entry.appearance_cache = None
 
-    @asyncio.coroutine
-    def run(self, log, appearance_changed_event, runner):
+    async def run(self, log, appearance_changed_event, runner):
         self.is_placeholder = False
         tool_name = tool_name_colored(self.tool, self.path)
         path = path_colored(self.path)
@@ -772,7 +771,7 @@ class Result:
             runner.pause()
         appearance_changed_event.set()
         start_time = time.time()
-        new_status = yield from runner.run_tool(self.path, self.tool)
+        new_status = await runner.run_tool(self.path, self.tool)
         Result.result.fget.evict(self)
         end_time = time.time()
         self.set_status(new_status)
diff --git a/vigil/worker.py b/vigil/worker.py
index 6f5a1c2..9bd3f9e 100755
--- a/vigil/worker.py
+++ b/vigil/worker.py
@@ -19,30 +19,27 @@ class Worker:
         self.process = None
         self.child_pgid = None
 
-    @asyncio.coroutine
-    def create_process(self):
+    async def create_process(self):
         create = asyncio.create_subprocess_exec(
             "vigil-worker", stdin=asyncio.subprocess.PIPE,
             stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE,
             preexec_fn=os.setsid)
-        self.process = yield from create
-        pid_line = yield from self.process.stdout.readline()
+        self.process = await create
+        pid_line = await self.process.stdout.readline()
         self.child_pgid = int(pid_line.strip())
         os.setpriority(os.PRIO_PGRP, self.child_pgid, 19)
 
-    @asyncio.coroutine
-    def run_tool(self, path, tool):
+    async def run_tool(self, path, tool):
         self.process.stdin.write(("%s\n%s\n" %
                                   (tool.__qualname__, path)).encode("utf-8"))
-        data = yield from self.process.stdout.readline()
+        data = await self.process.stdout.readline()
         return tools.Status(int(data))
 
-    @asyncio.coroutine
-    def job_runner(self, summary, log, jobs_added_event,
+    async def job_runner(self, summary, log, jobs_added_event,
                    appearance_changed_event):
-        yield from self.create_process()
+        await self.create_process()
         while True:
-            yield from jobs_added_event.wait()
+            await jobs_added_event.wait()
             while True:
                 try:
                     self.result = summary.get_closest_placeholder()
@@ -53,7 +50,7 @@ class Worker:
                         if self.is_being_tested:
                             os.kill(os.getpid(), signal.SIGINT)
                     break
-                yield from self.result.run(log, appearance_changed_event, self)
+                await self.result.run(log, appearance_changed_event, self)
                 summary.completed_total += 1
             jobs_added_event.clear()