##// END OF EJS Templates
Merge my main trunk work. Lots of testing and documentation work....
Merge my main trunk work. Lots of testing and documentation work. See the individual log messages for details, this is a branch that added a lot of tests, as well as improving the testing system quite a bit so it is more robust and identifies many more tests. Various API cleanups, bug fixes and improvements went in as well.

File last commit:

r1244:ba669b1a
r1878:56332962 merge
Show More
__init__.py
23 lines | 911 B | text/x-python | PythonLexer
# 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"
#-------------------------------------------------------------------------------
# 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.
#-------------------------------------------------------------------------------