##// END OF EJS Templates
Merging from trunk.
Merging from trunk.

File last commit:

r1244:ba669b1a
r1268:bb43f0d6 merge
Show More
__init__.py
23 lines | 911 B | text/x-python | PythonLexer
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"
#-------------------------------------------------------------------------------
# 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 E Granger
Finished initial reworking and updating of setup.py and friends, including the MANIFEST.in. Everything seems...
r1244 #-------------------------------------------------------------------------------