Fixed compatibility form conflict (bug 1055513)

See bug for all the details.
PEP8 also says to align with the opening delimiter:
http://legacy.python.org/dev/peps/pep-0008/#indentation