upstream/ipython Files · IPython/nbformat/v3/convert.py

Remove 5s wait on inactivity on GUI inputhook loops...

Remove 5s wait on inactivity on GUI inputhook loops The 5s (and 1s) waits were originally added in commit 5074878, but the 5 second wait meant if you left the console for 5+ minutes idle, it would take up to 5 seconds for a response to a keypress. This tradeoff of CPU cycles for battery life seems too far. Note that commit 5074878 was originally for wx, glut and pyglet are based on the wx version and came into existence after commit 5074878.

MinRK - - Load All Authors

File last commit:

r7545:59c2d87b


                r13125:f9e20986

Download file

             convert.py
        
                    59 lines
            
             | 1.9 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / nbformat / v3 / convert.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """Code for converting notebooks to and from the v2 format.

      Authors:

      * Brian Granger

      """

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

      #  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

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

      from .nbbase import (

          new_code_cell, new_text_cell, new_worksheet, new_notebook, new_output,

          nbformat, nbformat_minor

      )

      from IPython.nbformat import v2

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

      # Code

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

      def convert_to_this_nbformat(nb, orig_version=2, orig_minor=0):

          """Convert a notebook to the v3 format.

          Parameters

          ----------

          nb : NotebookNode

              The Python representation of the notebook to convert.

          orig_version : int

              The original version of the notebook to convert.

          orig_minor : int

              The original minor version of the notebook to convert (only relevant for v >= 3).

          """

          if orig_version == 1:

              nb = v2.convert_to_this_nbformat(nb)

              orig_version = 2

          if orig_version == 2:

              # Mark the original nbformat so consumers know it has been converted.

              nb.nbformat = nbformat

              nb.nbformat_minor = nbformat_minor

              nb.orig_nbformat = 2

              return nb

          elif orig_version == 3:

              if orig_minor != nbformat_minor:

                  nb.orig_nbformat_minor = orig_minor

              nb.nbformat_minor = nbformat_minor

              return nb

          else:

              raise ValueError('Cannot convert a notebook from v%s to v3' % orig_version)

	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

				"""Code for converting notebooks to and from the v2 format.

				Authors:

				* Brian Granger
				"""

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

				from .nbbase import (
				new_code_cell, new_text_cell, new_worksheet, new_notebook, new_output,
				nbformat, nbformat_minor
				)

				from IPython.nbformat import v2

				#-----------------------------------------------------------------------------
				# Code
				#-----------------------------------------------------------------------------

				def convert_to_this_nbformat(nb, orig_version=2, orig_minor=0):
				"""Convert a notebook to the v3 format.

				Parameters
				----------
				nb : NotebookNode
				The Python representation of the notebook to convert.
				orig_version : int
				The original version of the notebook to convert.
				orig_minor : int
				The original minor version of the notebook to convert (only relevant for v >= 3).
				"""
				if orig_version == 1:
				nb = v2.convert_to_this_nbformat(nb)
				orig_version = 2
				if orig_version == 2:
				# Mark the original nbformat so consumers know it has been converted.
				nb.nbformat = nbformat
				nb.nbformat_minor = nbformat_minor

				nb.orig_nbformat = 2
				return nb
				elif orig_version == 3:
				if orig_minor != nbformat_minor:
				nb.orig_nbformat_minor = orig_minor
				nb.nbformat_minor = nbformat_minor
				return nb
				else:
				raise ValueError('Cannot convert a notebook from v%s to v3' % orig_version)