← Back to branch summary

~ellisonbg/ipython/trunk-dev

~ellisonbg/ipython/trunk-dev

Viewing all changes in revision 1183.

Committer: Brian Granger
Date: 2009-03-23 15:54:00 UTC
mfrom: (1109.1.51 ipython)
Revision ID: ellisonbg@gmail.com-20090323155400-rl6u4nwi673pquh8

Merging latest trunk.

I got a criss-cross merge in this and did merge --weave. Hope this is
OK.

files added:
.bzrignore

IPython/Extensions/ipy_pretty.py

IPython/external/pretty.py

IPython/tests/obj_del.py

IPython/tests/tclass.py

IPython/tests/test_iplib.py

docs/autogen_api.py

docs/source/api

docs/source/api/index.txt

docs/source/development/coding_guide.txt

docs/source/development/doc_guide.txt

docs/source/parallel/vision_beam_pattern.png

docs/source/parallel/vision_cpu_load.png

docs/source/parallel/visionhpc.txt

docs/sphinxext/apigen.py

docs/sphinxext/docscrape.py

docs/sphinxext/docscrape_sphinx.py

docs/sphinxext/numpydoc.py

tools/alldeps

tools/alldeps/Makefile

tools/alldeps/README.txt

tools/alldeps/pkginstall

tools/alldeps/pkginstall.cfg

files renamed:
docs/source/development/development.txt => docs/source/development/overview.txt

files modified:
IPython/ColorANSI.py

IPython/ConfigLoader.py

IPython/CrashHandler.py

IPython/DPyGetOpt.py

IPython/Debugger.py

IPython/Extensions/InterpreterExec.py

IPython/Extensions/InterpreterPasteInput.py

IPython/Extensions/PhysicalQInput.py

IPython/Extensions/PhysicalQInteractive.py

IPython/Extensions/clearcmd.py

IPython/Extensions/ext_rescapture.py

IPython/Extensions/ipy_profile_zope.py

IPython/Extensions/ipy_winpdb.py

IPython/Extensions/pickleshare.py *

IPython/Extensions/pspersistence.py

IPython/FakeModule.py

IPython/Gnuplot2.py

IPython/GnuplotInteractive.py

IPython/GnuplotRuntime.py

IPython/Itpl.py

IPython/Logger.py

IPython/Magic.py

IPython/OInspect.py

IPython/OutputTrap.py

IPython/Prompts.py

IPython/PyColorize.py

IPython/Shell.py

IPython/UserConfig/ipythonrc

IPython/__init__.py

IPython/background_jobs.py

IPython/completer.py

IPython/deep_reload.py

IPython/excolors.py

IPython/external/Itpl.py

IPython/external/mglob.py *

IPython/genutils.py

IPython/gui/wx/ipshell_nonblocking.py

IPython/gui/wx/ipython_history.py

IPython/gui/wx/ipython_view.py *

IPython/gui/wx/wxIPython.py

IPython/history.py

IPython/hooks.py

IPython/ipapi.py

IPython/iplib.py

IPython/ipmaker.py

IPython/ipstruct.py

IPython/kernel/core/prompts.py

IPython/kernel/core/ultraTB.py

IPython/kernel/core/util.py

IPython/kernel/scripts/ipcluster *

IPython/kernel/scripts/ipcluster.py *

IPython/kernel/scripts/ipcontroller *

IPython/kernel/scripts/ipcontroller.py *

IPython/kernel/scripts/ipengine *

IPython/kernel/scripts/ipengine.py *

IPython/kernel/tests/engineservicetest.py

IPython/macro.py

IPython/numutils.py

IPython/platutils.py

IPython/platutils_dummy.py

IPython/platutils_posix.py

IPython/platutils_win32.py

IPython/rlineimpl.py

IPython/shellglobals.py

IPython/strdispatch.py

IPython/testing/decorators.py

IPython/testing/decorators_numpy.py

IPython/testing/iptest.py

IPython/testing/plugin/Makefile

IPython/testing/plugin/dtexample.py

IPython/testing/plugin/ipdoctest.py

IPython/tests/test_genutils.py

IPython/tests/test_magic.py

IPython/twshell.py

IPython/ultraTB.py

IPython/usage.py

IPython/wildcard.py

docs/Makefile

docs/source/conf.py

docs/source/development/index.txt

docs/source/index.txt

docs/source/install/index.txt

docs/source/install/install.txt

docs/source/interactive/reference.txt

docs/source/overview.txt

docs/source/parallel/index.txt

docs/sphinxext/inheritance_diagram.py

docs/sphinxext/ipython_console_highlighting.py

tools/compile.py *

Show diffs side-by-side

added added

removed removed

IPython/ColorANSI.py

IPython/ConfigLoader.py

IPython/CrashHandler.py

IPython/DPyGetOpt.py

IPython/Debugger.py

IPython/Extensions/InterpreterExec.py

IPython/Extensions/InterpreterPasteInput.py

IPython/Extensions/PhysicalQInput.py

IPython/Extensions/PhysicalQInteractive.py

IPython/Extensions/clearcmd.py

IPython/Extensions/ext_rescapture.py

IPython/Extensions/ipy_pretty.py

IPython/Extensions/ipy_profile_zope.py

IPython/Extensions/ipy_winpdb.py

IPython/Extensions/pickleshare.py

IPython/Extensions/pspersistence.py

IPython/FakeModule.py

IPython/Gnuplot2.py

IPython/GnuplotInteractive.py

IPython/GnuplotRuntime.py

IPython/Itpl.py

IPython/Logger.py

IPython/Magic.py

IPython/OInspect.py

IPython/OutputTrap.py

IPython/Prompts.py

IPython/PyColorize.py

IPython/Shell.py

IPython/UserConfig/ipythonrc

IPython/__init__.py

IPython/background_jobs.py

IPython/completer.py

IPython/deep_reload.py

IPython/excolors.py

IPython/external/Itpl.py

IPython/external/mglob.py

IPython/external/pretty.py

IPython/genutils.py

IPython/gui/wx/ipshell_nonblocking.py

IPython/gui/wx/ipython_history.py

IPython/gui/wx/ipython_view.py

IPython/gui/wx/wxIPython.py

IPython/history.py

IPython/hooks.py

IPython/ipapi.py

IPython/iplib.py

IPython/ipmaker.py

IPython/ipstruct.py

IPython/kernel/core/prompts.py

IPython/kernel/core/ultraTB.py

IPython/kernel/core/util.py

IPython/kernel/tests/engineservicetest.py

IPython/macro.py

IPython/numutils.py

IPython/platutils.py

IPython/platutils_dummy.py

IPython/platutils_posix.py

IPython/platutils_win32.py

IPython/rlineimpl.py

IPython/shellglobals.py

IPython/strdispatch.py

IPython/testing/decorators.py

IPython/testing/decorators_numpy.py

IPython/testing/iptest.py

IPython/testing/plugin/Makefile

IPython/testing/plugin/dtexample.py

IPython/testing/plugin/ipdoctest.py

IPython/tests/obj_del.py

IPython/tests/tclass.py

IPython/tests/test_genutils.py

IPython/tests/test_iplib.py

IPython/tests/test_magic.py

IPython/twshell.py

IPython/ultraTB.py

IPython/usage.py

IPython/wildcard.py

docs/autogen_api.py

docs/source/api/

docs/source/api/index.txt

docs/source/conf.py

docs/source/development/coding_guide.txt

docs/source/development/doc_guide.txt

docs/source/development/index.txt

docs/source/development/overview.txt

docs/source/index.txt

docs/source/install/index.txt

docs/source/install/install.txt

docs/source/interactive/reference.txt

docs/source/overview.txt

docs/source/parallel/index.txt

docs/source/parallel/vision_beam_pattern.png

docs/source/parallel/vision_cpu_load.png

docs/source/parallel/visionhpc.txt

docs/sphinxext/apigen.py

docs/sphinxext/docscrape.py

docs/sphinxext/docscrape_sphinx.py

docs/sphinxext/inheritance_diagram.py

docs/sphinxext/ipython_console_highlighting.py

docs/sphinxext/numpydoc.py

tools/alldeps/Makefile

tools/alldeps/README.txt

tools/alldeps/pkginstall

tools/alldeps/pkginstall.cfg

Older »