Bug 839455 - Use new exception handling syntax in Python code. r=dhunt