18414ab8c2
Took the chance to also update the syntax from the old style "except socket.error, e:" to "except socket.error as e"