##// 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
/ IPython / core / tests
__init__.py Loading ...
obj_del.py Loading ...
refbug.py Loading ...
tclass.py Loading ...
test_fakemodule.py Loading ...
test_imports.py Loading ...
test_iplib.py Loading ...
test_magic.py Loading ...