##// END OF EJS Templates
Merge pull request #4498 from takluyver/daemon-streamcapturer...
Merge pull request #4498 from takluyver/daemon-streamcapturer Daemon StreamCapturer The StreamCapturer should die if the main thread crashes. On Shiningpanda, a failure in another nose plugin has been causing the tests to hang, because the main thread exits, but the StreamCapturer thread is still alive. Under normal conditions, the thread will still be shut down cleanly - it will only die a messy death if the main thread does.

File last commit:

r12493:45906317
r13524:b1976c99 merge
Show More
convert.py
16 lines | 658 B | text/x-python | PythonLexer
Brian E. Granger
More review changes....
r4609 """Convert notebook to the v1 format."""
Brian E. Granger
Full versioning added to nbformat.
r4406
Brian E. Granger
More review changes....
r4609 #-----------------------------------------------------------------------------
# Copyright (C) 2008-2011 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Code
#-----------------------------------------------------------------------------
Brian E. Granger
Full versioning added to nbformat.
r4406
Jonathan Frederic
Notebook version conversions done right?
r12493 def upgrade(nb, orig_version=None):
Brian E. Granger
Full versioning added to nbformat.
r4406 raise ValueError('Cannot convert to v1 notebook format')