fix problematic code found by 2to3
Merge branch 'python3'