##// 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.
Fernando Perez - - Load All Authors

File last commit:

r1877:d11df54f
r2124:4a54d9d3 merge
Show More
.bzrignore
4 lines | 110 B | text/plain | TextLexer
/ .bzrignore
History | Annotation | Raw |Copy content |Copy permalink
# IPython-specific files and pattersn that bzr should ignore
docs/dist
docs/build/*
docs/source/api/generated