standardize to modern 'except FooError as err:' syntax (Part 3)
Merge pull request #4818 from hulu/except-as-three

standardize to modern 'except FooError as err:' syntax (Part 3)