Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/weewx/weewx into ws1_impr…
Browse files Browse the repository at this point in the history
…oved
  • Loading branch information
Talon1024 committed Apr 20, 2016
2 parents 46f4ee6 + 9024bf9 commit 0400a01
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bin/weewx/restx.py
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ def _get_connect(self, server, port):
# Unsuccessful. Close it in case it was open:
try:
_sock.close()
except socket.error:
except AttributeError, socket.error:
pass
raise ConnectError(e)

Expand Down

0 comments on commit 0400a01

Please sign in to comment.