diff --git a/ChangeLog b/ChangeLog index 934c6fd..5a5ff9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ ChangeLog ============ +- 0.33.0 + + - fixed timeout+ssl error handling bug on python 2.7.10 (#190) + - 0.32.0 - fix http proxy bug (#189) diff --git a/setup.py b/setup.py index e77383b..dfd7702 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup import sys -VERSION = "0.32.0" +VERSION = "0.33.0" NAME="websocket_client" install_requires = ["six"] diff --git a/websocket/__init__.py b/websocket/__init__.py index 311c677..0b535ef 100644 --- a/websocket/__init__.py +++ b/websocket/__init__.py @@ -22,4 +22,4 @@ Copyright (C) 2010 Hiroki Ohtani(liris) from ._core import * from ._app import WebSocketApp -__version__ = "0.32.0" +__version__ = "0.33.0" diff --git a/websocket/_utils.py b/websocket/_utils.py index dda1d0c..7ece785 100644 --- a/websocket/_utils.py +++ b/websocket/_utils.py @@ -85,4 +85,7 @@ def validate_utf8(utfbytes): def extract_err_message(exception): - return getattr(exception, 'strerror', str(exception)) + if exception.args: + return exception.args[0] + else: + return None