Chase PEP-3110

Replace except Environment, e: with except Environment as e for
compatibility between python 2.x and python 3.x.

While here, fix a bad indentation change from r346620 by reindenting the code
properly.

MFC after: 2 months