##// END OF EJS Templates
Merge pull request #4228 from ivanov/doc-touchup...
Merge pull request #4228 from ivanov/doc-touchup update -dev docs to reflect latest stable version

File last commit:

r12473:1bca05e0
r12586:b2b2ebbb merge
Show More
__init__.py
144 lines | 5.5 KiB | text/x-python | PythonLexer
Brian Granger
Continuing a massive refactor of everything.
r2205 # encoding: utf-8
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """
Fernando Perez
Minor date/info updates for release.
r4451 IPython: tools for interactive and parallel computing in Python.
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
Fernando Perez
Minor date/info updates for release.
r4451 http://ipython.org
Fernando Perez
Remove svn-style $Id marks from docstrings and Release imports....
r1853 """
Brian Granger
Continuing a massive refactor of everything.
r2205 #-----------------------------------------------------------------------------
Fernando Perez
Minor date/info updates for release.
r4451 # Copyright (c) 2008-2011, IPython Development Team.
Fernando Perez
Complete support of git commit info with IPython.sys_info()....
r3204 # Copyright (c) 2001-2007, Fernando Perez <fernando.perez@colorado.edu>
# Copyright (c) 2001, Janko Hauser <jhauser@zscout.de>
# Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu>
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #
Fernando Perez
Complete support of git commit info with IPython.sys_info()....
r3204 # Distributed under the terms of the Modified BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
Brian Granger
Continuing a massive refactor of everything.
r2205 #-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 from __future__ import absolute_import
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
Brian Granger
Continuing a massive refactor of everything.
r2205 import os
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 import sys
Brian Granger
Continuing a massive refactor of everything.
r2205
#-----------------------------------------------------------------------------
# Setup everything
#-----------------------------------------------------------------------------
Fernando Perez
Fix invalid version check in setup.py.
r3196 # Don't forget to also update setup.py when this changes!
MinRK
update version-check message in setup.py and IPython.__init__...
r12473 if sys.version_info[:2] < (2,7):
raise ImportError('IPython requires Python Version 2.7 or above.')
vivainio
Moved path to extensions - pickleshare failed because it imported...
r168
# Make it easy to import extensions - they are always directly on pythonpath.
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 # Therefore, non-IPython modules can be added to extensions directory.
# This should probably be in ipapp.py.
Brian Granger
Renaming Extensions=>extensions in code and imports.
r2064 sys.path.append(os.path.join(os.path.dirname(__file__), "extensions"))
fperez
Small fix to sys.argv, match python's default behavior.
r298
Brian Granger
Merging upstream changes from inputhook and config-refactor....
r2224 #-----------------------------------------------------------------------------
# Setup the top level names
#-----------------------------------------------------------------------------
vivainio
corrected some problematic module interdependencies
r695
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 from .config.loader import Config
MinRK
move core.ipapi -> core.getipython
r10612 from .core.getipython import get_ipython
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 from .core import release
from .core.application import Application
Fernando Perez
Fix imports for plain terminal ipython and use a proper warn() call.
r11020 from .terminal.embed import embed
Scott Tsai
embed_kernel: give a clear error message on pyzmq ImportError
r6044
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 from .core.error import TryNext
Brian Granger
Moving and renaming in preparation of subclassing InteractiveShell....
r2760 from .core.interactiveshell import InteractiveShell
Fernando Perez
Ported the IPython Sphinx directive to 0.11....
r2439 from .testing import test
Fernando Perez
Complete support of git commit info with IPython.sys_info()....
r3204 from .utils.sysinfo import sys_info
MinRK
remove unnecessarily specific extract_module_locals_above
r6570 from .utils.frame import extract_module_locals
vivainio
corrected some problematic module interdependencies
r695
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Release data
MinRK
update release/authors...
r9188 __author__ = '%s <%s>' % (release.author, release.author_email)
Brian Granger
Release.py => core/release.py and imports updated.
r2043 __license__ = release.license
__version__ = release.version
MinRK
add IPython.version_info...
r8448 version_info = release.version_info
Scott Tsai
embed_kernel: only import zmq when needed
r6219
MinRK
adjust embed_kernel signature...
r6571 def embed_kernel(module=None, local_ns=None, **kwargs):
"""Embed and start an IPython kernel in a given scope.
MinRK
add IPython.start_kernel...
r11175 If you don't want the kernel to initialize the namespace
from the scope of the surrounding function,
and/or you want to load full IPython configuration,
you probably want `IPython.start_kernel()` instead.
MinRK
adjust embed_kernel signature...
r6571 Parameters
----------
module : ModuleType, optional
The module to load into IPython globals (default: caller)
local_ns : dict, optional
The namespace to load into IPython user namespace (default: caller)
kwargs : various, optional
MinRK
fix a few remaining KernelApp/IPKernelApp changes
r9516 Further keyword args are relayed to the IPKernelApp constructor,
MinRK
adjust embed_kernel signature...
r6571 allowing configuration of the Kernel. Will only have an effect
on the first embed_kernel call for a given process.
"""
MinRK
remove unnecessarily specific extract_module_locals_above
r6570 (caller_module, caller_locals) = extract_module_locals(1)
Scott Tsai
embed_kernel: only import zmq when needed
r6219 if module is None:
module = caller_module
if local_ns is None:
local_ns = caller_locals
MinRK
adjust embed_kernel signature...
r6571
Scott Tsai
embed_kernel: only import zmq when needed
r6219 # Only import .zmq when we really need it
MinRK
move IPython.inprocess to IPython.kernel.inprocess
r9375 from IPython.kernel.zmq.embed import embed_kernel as real_embed_kernel
MinRK
adjust embed_kernel signature...
r6571 real_embed_kernel(module=module, local_ns=local_ns, **kwargs)
MinRK
add IPython.start_ipython...
r11173
def start_ipython(argv=None, **kwargs):
MinRK
expand start_ipython / embed docstrings...
r11174 """Launch a normal IPython instance (as opposed to embedded)
MinRK
add IPython.start_ipython...
r11173
MinRK
expand start_ipython / embed docstrings...
r11174 `IPython.embed()` puts a shell in a particular calling scope,
such as a function or method for debugging purposes,
which is often not desirable.
`start_ipython()` does full, regular IPython initialization,
including loading startup files, configuration, etc.
much of which is skipped by `embed()`.
MinRK
add IPython.start_ipython...
r11173
MinRK
expand start_ipython / embed docstrings...
r11174 This is a public API method, and will survive implementation changes.
MinRK
add IPython.start_ipython...
r11173
Parameters
----------
argv : list or None, optional
If unspecified or None, IPython will parse command-line options from sys.argv.
To prevent any command-line parsing, pass an empty list: `argv=[]`.
MinRK
expand start_ipython / embed docstrings...
r11174 user_ns : dict, optional
specify this dictionary to initialize the IPython user namespace with particular values.
MinRK
add IPython.start_ipython...
r11173 kwargs : various, optional
Any other kwargs will be passed to the Application constructor,
such as `config`.
"""
from IPython.terminal.ipapp import launch_new_instance
return launch_new_instance(argv=argv, **kwargs)
MinRK
add IPython.start_kernel...
r11175
def start_kernel(argv=None, **kwargs):
"""Launch a normal IPython kernel instance (as opposed to embedded)
`IPython.embed_kernel()` puts a shell in a particular calling scope,
such as a function or method for debugging purposes,
which is often not desirable.
`start_kernel()` does full, regular IPython initialization,
including loading startup files, configuration, etc.
much of which is skipped by `embed()`.
Parameters
----------
argv : list or None, optional
If unspecified or None, IPython will parse command-line options from sys.argv.
To prevent any command-line parsing, pass an empty list: `argv=[]`.
user_ns : dict, optional
specify this dictionary to initialize the IPython user namespace with particular values.
kwargs : various, optional
Any other kwargs will be passed to the Application constructor,
such as `config`.
"""
from IPython.kernel.zmq.kernelapp import launch_new_instance
return launch_new_instance(argv=argv, **kwargs)