upstream/ipython Files · IPython/nbformat/v1/__init__.py

Merge pull request from takluyver/daemon-streamcapturer...

Merge pull request 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.

Jonathan Frederic - - Load All Authors

File last commit:

r12494:5dd12646


                r13524:b1976c99

Download file

             __init__.py
        
                    23 lines
            
             | 868 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / nbformat / v1 / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Brian E. Granger
    
More review changes....

              r4609
            
      """The main module for the v1 notebook format."""

      #-----------------------------------------------------------------------------

      #  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.

      #-----------------------------------------------------------------------------

      #-----------------------------------------------------------------------------

      # Imports

      #-----------------------------------------------------------------------------

        Brian E. Granger
    
Full versioning added to nbformat.

              r4406
            
      from .nbbase import (

          NotebookNode,

          new_code_cell, new_text_cell, new_notebook

      )

      from .nbjson import reads as reads_json, writes as writes_json

      from .nbjson import reads as read_json, writes as write_json

      from .nbjson import to_notebook as to_notebook_json

        Jonathan Frederic
    
Fixes (iptest), simplified v1, v2, .. , vX import code

              r12494
            
      from .convert import upgrade

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Brian E. Granger More review changes....	r4609	"""The main module for the v1 notebook format."""

		#-----------------------------------------------------------------------------
		# 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.
		#-----------------------------------------------------------------------------

		#-----------------------------------------------------------------------------
		# Imports
		#-----------------------------------------------------------------------------
Brian E. Granger Full versioning added to nbformat.	r4406
		from .nbbase import (
		NotebookNode,
		new_code_cell, new_text_cell, new_notebook
		)

		from .nbjson import reads as reads_json, writes as writes_json
		from .nbjson import reads as read_json, writes as write_json
		from .nbjson import to_notebook as to_notebook_json

Jonathan Frederic Fixes (iptest), simplified v1, v2, .. , vX import code	r12494	from .convert import upgrade