mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-30 12:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend

Browse Source 
Conflicts:
	IPython/frontend/qt/console/frontend_widget.py
	IPython/frontend/qt/console/ipython_widget.py
	IPython/zmq/ipkernel.py
This commit is contained in:
epatters 2010-08-19 09:33:09 -05:00
commit 3ef5b1de92
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPython/testing/iptest.py
View File

@ -250,7 +250,7 @@ class IPTester(object):
return os.system(' '.join(self.call_args)) return os.system(' '.join(self.call_args))
else: else:
def _run_cmd(self): def _run_cmd(self):
#print >> sys.stderr, '*** CMD:', ' '.join(self.call_args) # dbg # print >> sys.stderr, '*** CMD:', ' '.join(self.call_args) # dbg
subp = subprocess.Popen(self.call_args) subp = subprocess.Popen(self.call_args)
self.pids.append(subp.pid) self.pids.append(subp.pid)
# If this fails, the pid will be left in self.pids and cleaned up # If this fails, the pid will be left in self.pids and cleaned up