##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

Merging -r 1177 from lp:ipython with fixes and resolutions....
Merging -r 1177 from lp:ipython with fixes and resolutions. The main conflicts I had to fix were in ultratb. I have removed the ultraTB.py in IPython/kernel/core. Now IPython/core/ultratb.py is being used everywhere. Also I have protected the calls to ipapi.get to see if None is returned. This happens when trial IPython.kernel is run.
Brian Granger -
r2124:4a54d9d3 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 ...
util.py Loading ...