Merge branch 'master' of https://github.com/weewx/weewx into ws1_improved

This commit is contained in:
Kevin Caccamo
2016-04-19 21:21:51 -04:00

View File

@@ -1067,7 +1067,7 @@ class CWOPThread(RESTThread):
# Unsuccessful. Close it in case it was open:
try:
_sock.close()
except socket.error:
except AttributeError, socket.error:
pass
raise ConnectError(e)