##// END OF EJS Templates
More work to address review comments....
More work to address review comments. * Moved twisted import to top-level of :mod:`IPython.kernel.error` (r1333). * Added docstring about :meth:`InteractiveShell.load_extension` returning whatever the return value of :func:`load_ipython_extension` is. * Renamed the :attr:`user_config_ns` attribute to :attr:`user_ns_hidden` to better reflect what it does. * Moved the ``%HOME`` to the end of home directory options attemped in :func:`IPython.utils.path.get_home_dir` on Windows.

File last commit:

r1234:52b55407
r2509:70d27296
Show More
__init__.py
13 lines | 580 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
__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.
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# Imports
#-------------------------------------------------------------------------------