ENH: make it work with IPython 2.0dev