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

Merge pull request from Carreau/ja...

Merge pull request from Carreau/ja Improve Image format validation and add html width,height This addresses the first two bullets of Validates first argument to constrain format to png, jpeg, Lets user specify width, height, or both and emits appropriate html I introduced a couple of class constants to minimize the number of times I saw 'jpeg' and 'png' and document the _ACCEPTABLE_FORMATS. I added one real jpeg image to the test directory and one zero-length gif file to survive the file not found error in super() Closes Add `assert_is_none`, `assert_is_not_none` to `nose.tools`

MinRK - - Load All Authors

File last commit:

r6630:ffeb4a6a


                r8116:19feb23c

Download file

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

      """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)

      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)

      del msg

      # 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

				"""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)
				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)
				del msg

				# 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