upstream/ipython Files · IPython/frontend/html/notebook/__init__.py

Merge pull request from minrk/clean_nan...

Merge pull request from minrk/clean_nan Clean nan/inf in json_clean. The floating point values NaN and Infinity are not part of the JSON specification and causes some parsers to throw errors. Since our usage is only for things like the display of function defaults, we can use a basic string representation ('NaN', 'inf', etc) instead.

MinRK - - Load All Authors

File last commit:

r6630:ffeb4a6a


                r8047:157d99af

Download file

             __init__.py
        
                    20 lines
            
             | 547 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / frontend / html / notebook / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        MinRK
    
update tornado dependency to 2.1...

              r4856
            
      """The IPython HTML Notebook"""

      # check for tornado 2.1.0

      msg = "The IPython Notebook requires tornado >= 2.1.0"

      try:

          import tornado

      except ImportError:

          raise ImportError(msg)

        Matthew Brett
    
Fix for tornado check for tornado < 1.1.0...

              r6132
            
      try:

          version_info = tornado.version_info

      except AttributeError:

          raise ImportError(msg + ", but you have < 1.1.0")

      if version_info < (2,1,0):

          raise ImportError(msg + ", but you have %s" % tornado.version)

        MinRK
    
update tornado dependency to 2.1...

              r4856
            
      del msg

        MinRK
    
add pyzmq check to notebook.__init__...

              r6630
            
      # check for pyzmq 2.1.4

      from IPython.zmq import check_for_zmq

      check_for_zmq('2.1.4', 'IPython.frontend.html.notebook')

      del check_for_zmq

	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

MinRK update tornado dependency to 2.1...	r4856	"""The IPython HTML Notebook"""

		# check for tornado 2.1.0
		msg = "The IPython Notebook requires tornado >= 2.1.0"
		try:
		import tornado
		except ImportError:
		raise ImportError(msg)
Matthew Brett Fix for tornado check for tornado < 1.1.0...	r6132	try:
		version_info = tornado.version_info
		except AttributeError:
		raise ImportError(msg + ", but you have < 1.1.0")
		if version_info < (2,1,0):
		raise ImportError(msg + ", but you have %s" % tornado.version)
MinRK update tornado dependency to 2.1...	r4856	del msg
MinRK add pyzmq check to notebook.__init__...	r6630
		# check for pyzmq 2.1.4
		from IPython.zmq import check_for_zmq
		check_for_zmq('2.1.4', 'IPython.frontend.html.notebook')
		del check_for_zmq