summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliris <liris.pp@gmail.com>2014-08-20 07:46:42 +0900
committerliris <liris.pp@gmail.com>2014-08-20 07:46:42 +0900
commitdaa6cb0192aee25184d1c5621b26264f9d933ea2 (patch)
treed7e783452b230729325d749cd53b0ad88fccad72
parent141b70de1f0a9065c2707aaa2573dc9c7c1b1b83 (diff)
downloadwebsocket-client-daa6cb0192aee25184d1c5621b26264f9d933ea2.tar.gz
- fixed #102
-rw-r--r--README.rst4
-rw-r--r--setup.py2
-rw-r--r--websocket/_core.py2
3 files changed, 7 insertions, 1 deletions
diff --git a/README.rst b/README.rst
index 22c82f4..408856d 100644
--- a/README.rst
+++ b/README.rst
@@ -157,6 +157,10 @@ example::
ChangeLog
============
+- v0.17.0
+
+ - can't set timeout on a standing websocket connection (#102)
+
- v0.16.0
- lock some method for multithread. (#92)
diff --git a/setup.py b/setup.py
index ea47df3..981a37d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup
import sys
-VERSION = "0.16.0a"
+VERSION = "0.17.0"
NAME="websocket-client"
install_requires = ["six"]
diff --git a/websocket/_core.py b/websocket/_core.py
index 5948ab3..f2480a6 100644
--- a/websocket/_core.py
+++ b/websocket/_core.py
@@ -383,6 +383,8 @@ class WebSocket(object):
timeout: timeout time(second).
"""
self._timeout = timeout
+ if self.sock:
+ self.sock.settimeout(timeout)
timeout = property(gettimeout, settimeout)