##// END OF EJS Templates
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.

File last commit:

r1542:1ca64ecf
r2124:4a54d9d3 merge
Show More
testupload
6 lines | 91 B | text/plain | TextLexer
#!/bin/sh
ipdir=$PWD/..
cd $ipdir/dist
scp * ipython@ipython.scipy.org:www/dist/testing/