[Python 3] Use new exception syntax, part 2

Summary:
These two hunks were supposed to be part of
991255eaa314b51e2dd586460311d4633a56eb86 but got dropped in an
auto-merge.

Reviewers: mollekopf

Reviewed By: mollekopf

Differential Revision: https://git.kolab.org/D3250