Merge pull request #2905 from minrk/kernel_parent_config

fix a few remaining KernelApp/IPKernelApp changes

IPython/__init__.py

@@ -68,7 +68,7 b' def embed_kernel(module=None, local_ns=None, **kwargs):'
         The namespace to load into IPython user namespace (default: caller)
     
     kwargs : various, optional
-        Further keyword args are relayed to the KernelApp constructor,
+        Further keyword args are relayed to the IPKernelApp constructor,
         allowing configuration of the Kernel.  Will only have an effect
         on the first embed_kernel call for a given process.
     

IPython/frontend/consoleapp.py

@@ -194,7 +194,7 b' class IPythonConsoleApp(Configurable):'
             argv = sys.argv[1:]
         self.kernel_argv = swallow_argv(argv, self.frontend_aliases, self.frontend_flags)
         # kernel should inherit default config file from frontend
-        self.kernel_argv.append("--KernelApp.parent_appname='%s'"%self.name)
+        self.kernel_argv.append("--IPKernelApp.parent_appname='%s'" % self.name)
     
     def init_connection_file(self):
         """find the connection file, and load the info if found.
@@ -244,7 +244,7 b' class IPythonConsoleApp(Configurable):'
     
     def load_connection_file(self):
         """load ip/port/hmac config from JSON connection file"""
-        # this is identical to KernelApp.load_connection_file
+        # this is identical to IPKernelApp.load_connection_file
         # perhaps it can be centralized somewhere?
         try:
             fname = filefind(self.connection_file, ['.', self.profile_dir.security_dir])

IPython/kernel/connect.py

@@ -123,7 +123,7 b' def get_connection_file(app=None):'
     
     Parameters
     ----------
-    app : KernelApp instance [optional]
+    app : IPKernelApp instance [optional]
         If unspecified, the currently running app will be used
     """
     if app is None:

IPython/kernel/zmq/embed.py

@@ -25,7 +25,7 b' def embed_kernel(module=None, local_ns=None, **kwargs):'
         The namespace to load into IPython user namespace (default: caller)
     
     kwargs : various, optional
-        Further keyword args are relayed to the KernelApp constructor,
+        Further keyword args are relayed to the IPKernelApp constructor,
         allowing configuration of the Kernel.  Will only have an effect
         on the first embed_kernel call for a given process.
     

IPython/kernel/zmq/kernelapp.py

@@ -74,7 +74,7 b' kernel_aliases.update({'
     'transport': 'IPKernelApp.transport',
 })
 if sys.platform.startswith('win'):
-    kernel_aliases['interrupt'] = 'KernelApp.interrupt'
+    kernel_aliases['interrupt'] = 'IPKernelApp.interrupt'
 
 kernel_flags = dict(base_flags)
 kernel_flags.update({