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

r1637:3d4a1f01
r2124:4a54d9d3 merge
Show More
check_sources.py
15 lines | 258 B | text/x-python | PythonLexer
vivainio
move path to external
r964 from IPython.external.path import path
vivainio
merge all from 0.7.3 branch to trunk
r503 fs = path('..').walkfiles('*.py')
for f in fs:
errs = ''
cont = f.bytes()
if '\t' in cont:
errs+='t'
if '\r' in cont:
errs+='r'
if errs:
print "%3s" % errs, f
Ville M. Vainio
ileo: %lno magic allows quick note taking
r1637