##// 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:

r2060:9544ab83
r2124:4a54d9d3 merge
Show More
update_revnum.py
23 lines | 579 B | text/x-python | PythonLexer
ville
initialization (no svn history)
r988 #!/usr/bin/env python
""" Change the revision number in Release.py """
import os
Ville M. Vainio
version string in Release contains bzr branch if not 'ipython'
r1072 import re,pprint
ville
initialization (no svn history)
r988
Ville M. Vainio
version string in Release contains bzr branch if not 'ipython'
r1072 def verinfo():
out = os.popen('bzr version-info')
pairs = (l.split(':',1) for l in out)
d = dict(((k,v.strip()) for (k,v) in pairs))
return d
ville
initialization (no svn history)
r988
Ville M. Vainio
version string in Release contains bzr branch if not 'ipython'
r1072 ver = verinfo()
pprint.pprint(ver)
ville
initialization (no svn history)
r988
Brian Granger
Fixing a few bugs to get the win32 installer working again.
r2060 rfile = open('../IPython/core/release.py','rb').read()
Ville M. Vainio
version string in Release contains bzr branch if not 'ipython'
r1072 newcont = re.sub(r'revision\s*=.*', "revision = '%s'" % ver['revno'], rfile)
newcont = re.sub(r'^branch\s*=[^=].*', "branch = '%s'" % ver['branch-nick'], newcont )
Brian Granger
Fixing a few bugs to get the win32 installer working again.
r2060 open('../IPython/core/release.py','wb').write(newcont)