upstream/ipython Files · IPython/kernel/__init__.py

normalize line endings in repo

Fernando Perez - - Load All Authors

File last commit:

r2482:6b305ad5


                r3218:401fb37a

Download file

             __init__.py
        
                    25 lines
            
             | 953 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / kernel / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Brian E Granger
    
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...

              r1234
            
      # encoding: utf-8

      """The IPython1 kernel.

      The IPython kernel actually refers to three things:

       * The IPython Engine

       * The IPython Controller

       * Clients to the IPython Controller

      The kernel module implements the engine, controller and client and all the 

      network protocols needed for the various entities to talk to each other.

      An end user should probably begin by looking at the `client.py` module

      if they need blocking clients or in `asyncclient.py` if they want asynchronous,

      deferred/Twisted using clients.

      """

      __docformat__ = "restructuredtext en"

        Brian Granger
    
Fix for ticket: https://bugs.launchpad.net/bugs/361414...

              r1945
            
      #-----------------------------------------------------------------------------

        Brian E Granger
    
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...

              r1234
            
      #  Copyright (C) 2008  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.

        Brian Granger
    
Initial refactor of task dependency system....

              r1952
            
      #-----------------------------------------------------------------------------

        Fernando Perez
    
Moved twisted import into a function, so base exception classes in kernel...

              r2482
            
      from IPython.kernel.error import TaskRejectError

	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

Brian E Granger This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...	r1234	# encoding: utf-8
		"""The IPython1 kernel.

		The IPython kernel actually refers to three things:

		* The IPython Engine
		* The IPython Controller
		* Clients to the IPython Controller

		The kernel module implements the engine, controller and client and all the
		network protocols needed for the various entities to talk to each other.

		An end user should probably begin by looking at the `client.py` module
		if they need blocking clients or in `asyncclient.py` if they want asynchronous,
		deferred/Twisted using clients.
		"""
		__docformat__ = "restructuredtext en"
Brian Granger Fix for ticket: https://bugs.launchpad.net/bugs/361414...	r1945	#-----------------------------------------------------------------------------
Brian E Granger This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...	r1234	# Copyright (C) 2008 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.
Brian Granger Initial refactor of task dependency system....	r1952	#-----------------------------------------------------------------------------

Fernando Perez Moved twisted import into a function, so base exception classes in kernel...	r2482	from IPython.kernel.error import TaskRejectError