summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter Bolsterlee <wouter@bolsterl.ee>2016-12-14 20:49:28 +0100
committerGitHub <noreply@github.com>2016-12-14 20:49:28 +0100
commite836657732e5f4cb1d17816455f21fd1414e2820 (patch)
tree7180cce1bba23a086c99fc8a03b858f1f58164fe
parent2a3f51efa9509a0130b3f13bd5a8c7c39992a511 (diff)
parented95537d029a574ba52143462ca6e917c9a25d20 (diff)
downloadhappybase-e836657732e5f4cb1d17816455f21fd1414e2820.tar.gz
Merge pull request #146 from ecederstrand/patch-1
Set socket timeout unconditionally on TSocket
-rw-r--r--happybase/connection.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/happybase/connection.py b/happybase/connection.py
index 36c6735..01ab83b 100644
--- a/happybase/connection.py
+++ b/happybase/connection.py
@@ -151,9 +151,7 @@ class Connection(object):
def _refresh_thrift_client(self):
"""Refresh the Thrift socket, transport, and client."""
- socket = TSocket(self.host, self.port)
- if self.timeout is not None:
- socket.set_timeout(self.timeout)
+ socket = TSocket(host=self.host, port=self.port, socket_timeout=self.timeout)
self.transport = self._transport_class(socket)
protocol = self._protocol_class(self.transport, decode_response=False)