##// END OF EJS Templates
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
/ test
manualtest_repr_tb.py Loading ...
runtests.py Loading ...
test_autocall.ipy Loading ...
test_cd.ipy Loading ...
test_completer.py Loading ...
test_cpaste.ipy Loading ...
test_embed.py Loading ...
test_handlers.py Loading ...
test_ihist.ipy Loading ...
test_ipapi.py Loading ...
test_irunner.py Loading ...
test_prefilter.py Loading ...
test_shell_options.py Loading ...
test_shouldfail.ipy Loading ...
test_wildcard.py Loading ...