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

Merge pull request from bfroehle/_1890_magic_arguments_docstring...

Merge pull request from bfroehle/_1890_magic_arguments_docstring magic_arguments: dedent but otherwise preserve indentation. Previously magic_arguments stripped all whitespace at the beginning of each line, interfering with formatting syntax which relies on indentation to give context (e.g., code blocks). Now the docstring text is passed through dedent to strip the global indentation before being handed off to `RawDescriptionHelpFormatter` which preserves any remaining indentation. Thanks to @rkern for suggesting the solution approach. Closes gh-1890.

MinRK - - Load All Authors

File last commit:

r6630:ffeb4a6a


                r7496:673e5331

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