ipython/ipython — pull request #2100 by Carreau (2012-07-05 11:50:39+00:00)
Title: [in progress] python 2 and 3 compatibility without 2to3, second try

After discussion in #2095, apply a smaller set of 2to3 fix.