Why did you undo the nice pep8-compliant formatting which limited the line length? I think it should be changed back to how it was, and just add the timeout on a new line.