##// 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 / kernel
config
core
scripts
tests
__init__.py Loading ...
asyncclient.py Loading ...
client.py Loading ...
clientconnector.py Loading ...
clientinterfaces.py Loading ...
codeutil.py Loading ...
contexts.py Loading ...
controllerservice.py Loading ...
engineconnector.py Loading ...
enginefc.py Loading ...
engineservice.py Loading ...
error.py Loading ...
fcutil.py Loading ...
magic.py Loading ...
map.py Loading ...
mapper.py Loading ...
multiengine.py Loading ...
multiengineclient.py Loading ...
multienginefc.py Loading ...
newserialized.py Loading ...
parallelfunction.py Loading ...
pbconfig.py Loading ...
pbutil.py Loading ...
pendingdeferred.py Loading ...
pickleutil.py Loading ...
task.py Loading ...
taskclient.py Loading ...
taskfc.py Loading ...
twistedutil.py Loading ...
util.py Loading ...