Fix 2to3 fixers to work with Python 3.
Fix 2to3 fixers to work with Python 3.
Merge branch 'py3k-backport' into testing