Merge pull request #7330 from minrk/display-name

use 'Python X' for IPython kernel display name
ipython · Jan 1, 2015 · 6a33e98 · 6a33e98
2 parents 1ab864b + 353f680
commit 6a33e98
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/IPython/html/services/kernelspecs/tests/test_kernelspecs_api.py b/IPython/html/services/kernelspecs/tests/test_kernelspecs_api.py
@@ -102,7 +102,7 @@ def is_sample_kernelspec(s):
             return s['name'] == 'sample' and s['spec']['display_name'] == 'Test kernel'
 
         def is_default_kernelspec(s):
-            return s['name'] == NATIVE_KERNEL_NAME and s['spec']['display_name'].startswith("IPython")
+            return s['name'] == NATIVE_KERNEL_NAME and s['spec']['display_name'].startswith("Python")
 
         assert any(is_sample_kernelspec(s) for s in specs.values()), specs
         assert any(is_default_kernelspec(s) for s in specs.values()), specs

diff --git a/IPython/kernel/kernelspec.py b/IPython/kernel/kernelspec.py
@@ -107,10 +107,10 @@ def _native_kernel_dict(self):
         """Makes a kernel directory for the native kernel.
         
         The native kernel is the kernel using the same Python runtime as this
-        process. This will put its informatino in the user kernels directory.
+        process. This will put its information in the user kernels directory.
         """
         return {'argv': make_ipkernel_cmd(),
-                'display_name': 'IPython (Python %d)' % (3 if PY3 else 2),
+                'display_name': 'Python %i' % (3 if PY3 else 2),
                }
 
     @property