summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliris <liris.pp@gmail.com>2018-09-09 22:19:30 +0900
committerliris <liris.pp@gmail.com>2018-09-09 22:19:30 +0900
commitefcf31b30122e05701fb3f696b029baf8faa6d8e (patch)
tree7b931b4362eb88c444749aa8b9b19cd3d234a14d
parent601486746a29b9d5bfe15691084ff7d1e70b2ac9 (diff)
downloadwebsocket-client-0.53.0.tar.gz
fixed #471v0.53.0
-rw-r--r--ChangeLog4
-rw-r--r--setup.py2
-rw-r--r--websocket/__init__.py2
-rw-r--r--websocket/_app.py6
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c9ee01f..ad7f9e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
ChangeLog
============
+- 0.53.0
+
+ - on_open() missing 1 required positional argument: 'ws' (#471)
+
- 0.52.0
- fixed callback argument in _app.py (#468)
diff --git a/setup.py b/setup.py
index 7da5592..06dfdd6 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import sys
from setuptools import setup
import pkg_resources
-VERSION = "0.52.0"
+VERSION = "0.53.0"
NAME = "websocket_client"
install_requires = ["six"]
diff --git a/websocket/__init__.py b/websocket/__init__.py
index c917999..fe0c6f7 100644
--- a/websocket/__init__.py
+++ b/websocket/__init__.py
@@ -26,4 +26,4 @@ from ._exceptions import *
from ._logging import *
from ._socket import *
-__version__ = "0.52.0"
+__version__ = "0.53.0"
diff --git a/websocket/_app.py b/websocket/_app.py
index 982fa54..a281402 100644
--- a/websocket/_app.py
+++ b/websocket/_app.py
@@ -329,7 +329,11 @@ class WebSocketApp(object):
def _callback(self, callback, *args):
if callback:
try:
- callback(self, *args)
+ if inspect.ismethod(callback):
+ callback(*args)
+ else:
+ callback(self, *args)
+
except Exception as e:
_logging.error("error from callback {}: {}".format(callback, e))
if _logging.isEnabledForDebug():