You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		17 years ago
IPython/testing	Merging -r 1177 from lp:ipython with fixes and resolutions.	17 years ago
setup.py	Fixing installation related issues.	17 years ago
setupbase.py	Renaming Extensions=>extensions in code and imports.	17 years ago