Brian Granger acc15a048b 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.		2009-08-03 12:50:56 -07:00
..
iptest.py	Merging -r 1177 from lp:ipython with fixes and resolutions.	2009-08-03 12:50:56 -07:00