summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--setup.py2
-rw-r--r--websocket/__init__.py2
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f4483d1..652d781 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
ChangeLog
============
+- 0.48.0
+
+ - Add NullHandler to logger to fix python 2 issue. (#400)
+ - Fix the issue that websocket status message may not present (#403)
+ - Socket error not raised in nested try except in python2 (#408)
+ - Load system default certificates if none are given (#415)
+ - Fix waiting forever on ping/pong timeout (#411)
+ - socks5 via pysocks support (#417)
+ - v0.47.0 breaks ability to stop stream with `run_forever` (#410)
+ - _http.py: fix windows proxy error due to socktype (#427)
+
- 0.47.0
- Fix socket constructor in _open_socket to use all relevant variables from getaddrinfo. (#383)
diff --git a/setup.py b/setup.py
index 230e709..42ec523 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import sys
from setuptools import setup
import pkg_resources
-VERSION = "0.47.0"
+VERSION = "0.48.0"
NAME = "websocket_client"
install_requires = ["six"]
diff --git a/websocket/__init__.py b/websocket/__init__.py
index b90e65a..21db3fd 100644
--- a/websocket/__init__.py
+++ b/websocket/__init__.py
@@ -26,4 +26,4 @@ from ._exceptions import *
from ._logging import *
from ._socket import *
-__version__ = "0.47.0"
+__version__ = "0.48.0"