Adjust kernel management with recent async updates

Author: kevin-bates

jupyter_server/services/kernels/kernelmanager.py

@@ -105,13 +105,13 @@ def shutdown(self, now=False):
         self.restarter.stop()
 
         if now or (self.client is None):
-            self.manager.kill()
+            yield self.manager.kill()
         else:
             yield self.client_connected
             yield self.client.shutdown_or_terminate()
 
         self._close_client()
-        self.manager.cleanup()
+        yield self.manager.cleanup()
 
     @gen.coroutine
     def interrupt(self):

jupyter_server/services/kernelspecs/handlers.py

@@ -63,8 +63,7 @@ def get(self):
         model = {}
         model['default'] = km.default_kernel_name
         model['kernelspecs'] = specs = {}
-        found_kernels = yield maybe_future(kf.find_kernels())
-        for kernel_name, kernel_info in found_kernels:
+        for kernel_name, kernel_info in kf.find_kernels():
             try:
                 if is_kernelspec_model(kernel_info):
                     d = kernel_info
@@ -85,10 +84,8 @@ class KernelSpecHandler(APIHandler):
     @gen.coroutine
     def get(self, kernel_name):
         kf = self.kernel_finder
-        # TODO: Do we actually want all kernel type names to be case-insensitive?
         kernel_name = kernel_name.lower()
-        found_specs = yield maybe_future(kf.find_kernels())
-        for name, kernel_info in found_specs:
+        for name, kernel_info in kf.find_kernels():
             if name == kernel_name:
                 if is_kernelspec_model(kernel_info):
                     model = kernel_info