##// END OF EJS Templates
Merged Gael's ipython-sync-frontend branch with important mods....
Merged Gael's ipython-sync-frontend branch with important mods. This branch showed conflicts with recent changes I made to: IPython.kernel.core.interpreter IPython.kernel.core.tests.test_interpreter I resolved these conflicts and closed a ticket that Gael fixed in his branch. BUT, there is a related ticket that I opened. Furthermore, Gael was using nose in test_interpreter, but we need to keep things in IPython.kernel free of nose!
Brian Granger -
r1949:a093b34b merge
Show More
Name Size Modified Last Commit Author
/ IPython
Extensions
UserConfig
config
external
frontend
gui
kernel
testing
tests
tools
ColorANSI.py Loading ...
ConfigLoader.py Loading ...
CrashHandler.py Loading ...
DPyGetOpt.py Loading ...
Debugger.py Loading ...
FakeModule.py Loading ...
Gnuplot2.py Loading ...
GnuplotInteractive.py Loading ...
GnuplotRuntime.py Loading ...
Itpl.py Loading ...
Logger.py Loading ...
Magic.py Loading ...
OInspect.py Loading ...
OutputTrap.py Loading ...
Prompts.py Loading ...
PyColorize.py Loading ...
Release.py Loading ...
Shell.py Loading ...
__init__.py Loading ...
background_jobs.py Loading ...
completer.py Loading ...
deep_reload.py Loading ...
demo.py Loading ...
dtutils.py Loading ...
excolors.py Loading ...
generics.py Loading ...
genutils.py Loading ...
history.py Loading ...
hooks.py Loading ...
ipapi.py Loading ...
iplib.py Loading ...
ipmaker.py Loading ...
ipstruct.py Loading ...
irunner.py Loading ...
macro.py Loading ...
numutils.py Loading ...
platutils.py Loading ...
platutils_dummy.py Loading ...
platutils_posix.py Loading ...
platutils_win32.py Loading ...
prefilter.py Loading ...
rlineimpl.py Loading ...
shadowns.py Loading ...
shellglobals.py Loading ...
strdispatch.py Loading ...
twshell.py Loading ...
ultraTB.py Loading ...
upgrade_dir.py Loading ...
usage.py Loading ...
wildcard.py Loading ...
winconsole.py Loading ...