##// 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 / testing
attic
plugin
tests
__init__.py Loading ...
decorator_msim.py Loading ...
decorators.py Loading ...
decorators_numpy.py Loading ...
decorators_trial.py Loading ...
iptest.py Loading ...
mkdoctests.py Loading ...
parametric.py Loading ...
tools.py Loading ...
util.py Loading ...