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

Merge pull request from minrk/tb_syntaxerror...

Merge pull request from minrk/tb_syntaxerror fix %tb after SyntaxError Moves exc_info extraction to Shell._get_exc_info, since it was done twice in different places, and differently. Synchronizes expectations between showtraceback() and showsyntaxerror(), and ensures that sys.last_type, etc. get the right value. Previously failing test added.

Matthew Brett - - Load All Authors

File last commit:

r6132:2959fa0a


                r6189:94efbf76

Download file

             __init__.py
        
                    15 lines
            
             | 409 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

	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