##// 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 / kernel / core
config
tests
__init__.py Loading ...
display_formatter.py Loading ...
display_trap.py Loading ...
error.py Loading ...
fd_redirector.py Loading ...
file_like.py Loading ...
history.py Loading ...
interpreter.py Loading ...
macro.py Loading ...
magic.py Loading ...
message_cache.py Loading ...
notification.py Loading ...
output_trap.py Loading ...
prompts.py Loading ...
redirector_output_trap.py Loading ...
sync_traceback_trap.py Loading ...
traceback_formatter.py Loading ...
traceback_trap.py Loading ...
ultraTB.py Loading ...
util.py Loading ...