Add explicit comment about disabled code in importstring. This lets us know the deactivated code is meant for eventual deletion (the replacement was written by T. Kluyver in his 2to3 preparation work, we just need to be sure we have no problems with it in more testing).

Merge branch 'takowl-ipy3-preparation' into trunk This branch cleans up our trunk to make a 2to3 run be as painless as possible, while keeping our code fully 2.6-compatible. Closes gh-159 (pull request).

Rename misleading use of raw_input so it's not automatically converted to input by 2to3.

Revert "Option for testing local copy, rather than global. Testing needs more work." (Doesn't work; will use virtualenv instead) This reverts commit 9bef7e3b597be5bcecaf4e884146e672ecd6fe2d.

Option for testing local copy, rather than global. Testing needs more work.

Update md5 calls.

Change to pass tests in IPython.extensions

Replacing some .items() calls with .iteritems() for cleaner conversion with 2to3.

Tidy up dictionary-style methods of Config (2to3 converts 'has_key' calls to use the 'in' operator, which will be that of the parent dict unless we define it).

Update use of rjust