From a1ec09319ef666c02d8794fe79e302f76258ec6a Mon Sep 17 00:00:00 2001
From: Matthew Rocklin <mrocklin@gmail.com>
Date: Tue, 10 Jan 2017 11:20:52 -0500
Subject: [PATCH] rename compute_handlers to client_handlers

Also put in client= keywords as appropriate
---
 distributed/channels.py  |  2 +-
 distributed/scheduler.py | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/distributed/channels.py b/distributed/channels.py
index b62e63dc1a3..827090fe076 100644
--- a/distributed/channels.py
+++ b/distributed/channels.py
@@ -67,7 +67,7 @@ def unsubscribe(self, channel=None, client=None):
             del self.clients[channel]
             del self.stopped[channel]
 
-    def append(self, channel=None, key=None):
+    def append(self, channel=None, key=None, client=None):
         if self.stopped[channel]:
             return
 
diff --git a/distributed/scheduler.py b/distributed/scheduler.py
index 2b521c1d8e1..bab5019ef3c 100644
--- a/distributed/scheduler.py
+++ b/distributed/scheduler.py
@@ -270,12 +270,12 @@ def __init__(self, center=None, loop=None,
                                 'release': self.handle_missing_data,
                                 'add-keys': self.add_keys}
 
-        self.compute_handlers = {'update-graph': self.update_graph,
-                                 'client-desires-keys': self.client_desires_keys,
-                                 'update-data': self.update_data,
-                                 'report-key': self.report_on_key,
-                                 'client-releases-keys': self.client_releases_keys,
-                                 'restart': self.restart}
+        self.client_handlers = {'update-graph': self.update_graph,
+                                'client-desires-keys': self.client_desires_keys,
+                                'update-data': self.update_data,
+                                'report-key': self.report_on_key,
+                                'client-releases-keys': self.client_releases_keys,
+                                'restart': self.restart}
 
         self.handlers = {'register-client': self.add_client,
                          'scatter': self.scatter,
@@ -1073,9 +1073,9 @@ def handle_client(self, stream, client=None):
                         breakout = True
                         self.close()
                         break
-                    elif op in self.compute_handlers:
+                    elif op in self.client_handlers:
                         try:
-                            handler = self.compute_handlers[op]
+                            handler = self.client_handlers[op]
                             if 'client' not in msg:
                                 msg['client'] = client
                             result = handler(**msg)
@@ -1299,7 +1299,7 @@ def gather(self, stream=None, keys=None):
         raise gen.Return(result)
 
     @gen.coroutine
-    def restart(self, environment=None):
+    def restart(self, environment=None, client=None):
         """ Restart all workers.  Reset local state. """
         n = len(self.workers)
         with log_errors():