Merge branch 'master' of https://github.com/liris/websocket-client

websocket/_abnf.py

@@ -110,7 +110,7 @@ class ABNF(object):
             raise WebSocketProtocolException("rsv is not implemented, yet")
 
         if self.opcode not in ABNF.OPCODES:
-            raise WebSocketProtocolException("Invalid opcode " + self.opcode)
+            raise WebSocketProtocolException("Invalid opcode " + str(self.opcode))
 
         if self.opcode == ABNF.OPCODE_PING and not self.fin:
             raise WebSocketProtocolException("Invalid ping frame.")

websocket/_core.py

@@ -948,7 +948,8 @@ class WebSocket(object):
                 raise
 
         if not bytes:
-            self.sock.close()
+            if self.sock:
+                self.sock.close()
             self.sock = None
             self.connected = False
             raise WebSocketConnectionClosedException()