##// END OF EJS Templates
Merge branch 'htmlnotebook' of github.com:ipython/ipython into htmlnotebook...
Merge branch 'htmlnotebook' of github.com:ipython/ipython into htmlnotebook Conflicts: setupbase.py

File last commit:

r3518:584e9d75
r4485:d77eb2c8 merge
Show More
__init__.py
10 lines | 349 B | text/x-python | PythonLexer
Brian Granger
Fixed docstring of IPython.kernel.__init__.
r3518 """IPython.kernel has been replaced by IPython.parallel.
The previous version of IPython's parallel library was located at this
location (IPython.kernel). It has been moved to the IPython.parallel
subpackage and has been refactored to use zeromq/pyzmq instead of twisted.
Brian Granger
Adding IPython.kernel transition helper.
r3487
Please see INSERT URL for further details.
"""
Brian Granger
Fixed docstring of IPython.kernel.__init__.
r3518 raise ImportError(__doc__)