I've update the branch now. Is the usage of six.reraise correct?

Thanks!