K 10
svn:author
V 4
ngie
K 8
svn:date
V 27
2019-04-24T04:50:03.311790Z
K 7
svn:log
V 243
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

END