Use python 3 raise syntax
More python 3 import fixes