Permalink
Browse files

Fix a keyerror bug in the kernelmanager, prepare the code for pull re…

…quest
  • Loading branch information...
jamesgao committed Oct 21, 2010
1 parent b8c76d1 commit fb474f47a424e21f10dfd14c2519f8931ed153d1
Showing with 12 additions and 1 deletion.
  1. +4 −1 IPython/frontend/html/kernelmanager.py
  2. +6 −0 IPython/scripts/ipython-http
  3. +1 −0 setup.py
  4. +1 −0 setupbase.py
@@ -28,7 +28,10 @@ def register(self, client_id):
self.clients[client_id] = [time.time(), Queue.Queue()]
def __getitem__(self, client_id):
- return self.clients[client_id][1]
+ if client_id in self.clients:
+ return self.clients[client_id][1]
+ else:
+ return None
def append(self, msg):
"""Add a message to the SUB queues across all tracked clients"""
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from IPython.frontend.html.ipythonhttp import main
+
+main()
View
@@ -209,6 +209,7 @@ def cleanup():
'console_scripts': [
'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
+ 'ipython-http = IPython.frontend.html.ipythonhttp:main',
'pycolor = IPython.utils.PyColorize:main',
'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
'ipengine = IPython.kernel.ipengineapp:launch_new_instance',
View
@@ -261,6 +261,7 @@ def find_scripts():
pjoin(kernel_scripts, 'ipcluster'),
pjoin(main_scripts, 'ipython'),
pjoin(main_scripts, 'ipython-qtconsole'),
+ pjoin(main_scripts, 'ipython-http'),
pjoin(main_scripts, 'pycolor'),
pjoin(main_scripts, 'irunner'),
pjoin(main_scripts, 'iptest')

0 comments on commit fb474f4

Please sign in to comment.