Fix line ending style, syntax error

Converts line endings to UNIX-style and fixes a syntax error in an exception handler. (My bad, I was distracted earlier and read the thing hurriedly - the parenthesis thing wasn't entirely wrong, though, because Python 3 does need it when listing multiple types. Except 'e' of course wasn't a type but the old Python 2.5-style instance capturing syntax with the comma.)