clarifying comments/docstrings

Author: minrk

ipykernel/ipkernel.py

@@ -124,10 +124,11 @@ def set_parent(self, ident, parent):
     def init_metadata(self, parent):
         """Initialize metadata.
         
-        Run at the beginning of request handlers.
+        Run at the beginning of each execution request.
         """
         md = super(IPythonKernel, self).init_metadata(parent)
-        # FIXME: remove ipyparallel-specific code
+        # FIXME: remove deprecated ipyparallel-specific code
+        # This is required for ipyparallel < 5.0
         md.update({
             'dependencies_met' : True,
             'engine' : self.ident,
@@ -137,9 +138,10 @@ def init_metadata(self, parent):
     def finish_metadata(self, parent, metadata, reply_content):
         """Finish populating metadata.
         
-        Run after completing a request handler.
+        Run after completing an execution request.
         """
-        # FIXME: remove ipyparallel-specific code:
+        # FIXME: remove deprecated ipyparallel-specific code
+        # This is required by ipyparallel < 5.0
         metadata['status'] = reply_content['status']
         if reply_content['status'] == 'error' and reply_content['ename'] == 'UnmetDependency':
                 metadata['dependencies_met'] = False

ipykernel/kernelbase.py

@@ -348,7 +348,7 @@ def send_response(self, stream, msg_or_type, content=None, ident=None,
     def init_metadata(self, parent):
         """Initialize metadata.
         
-        Run at the beginning of request handlers.
+        Run at the beginning of execution requests.
         """
         return {
             'started': datetime.now(),
@@ -357,7 +357,7 @@ def init_metadata(self, parent):
     def finish_metadata(self, parent, metadata, reply_content):
         """Finish populating metadata.
         
-        Run after completing a request handler.
+        Run after completing an execution request.
         """
         return metadata