Merge pull request #143 from maralla/socket_shutdown

fix socket shutdown bug

tests/test_socket.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+
+from thriftpy.transport.socket import TSocket, TServerSocket
+from thriftpy.transport import TTransportException
+
+
+def test_close():
+    server = TServerSocket(host="localhost", port=12345)
+    client = TSocket(host="localhost", port=12345)
+
+    server.listen()
+    client.open()
+
+    c = server.accept()
+
+    client.close()
+
+    with pytest.raises(TTransportException) as e:
+        c.read(1024)
+    assert "TSocket read 0 bytes" in e.value.message
+
+    c.write(b"world")
+    c.close()
+
+    assert c.handle is None

thriftpy/transport/socket.py

@@ -25,10 +25,15 @@ def _resolveAddr(self):
                 socket.AI_PASSIVE | socket.AI_ADDRCONFIG)
 
     def close(self):
-        if self.handle:
+        if not self.handle:
+            return
+
+        try:
             self.handle.shutdown(socket.SHUT_RDWR)
             self.handle.close()
-            self.handle = None
+        except socket.error:
+            pass
+        self.handle = None
 
 
 class TSocket(TSocketBase):