##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

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 / utils
tests
DPyGetOpt.py Loading ...
PyColorize.py Loading ...
__init__.py Loading ...
coloransi.py Loading ...
generics.py Loading ...
genutils.py Loading ...
growl.py Loading ...
ipstruct.py Loading ...
platutils.py Loading ...
platutils_dummy.py Loading ...
platutils_posix.py Loading ...
platutils_win32.py Loading ...
rlineimpl.py Loading ...
strdispatch.py Loading ...
upgradedir.py Loading ...
wildcard.py Loading ...
winconsole.py Loading ...