senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refactor.network.devel' into okex.devel

Browse Source
This commit is contained in:
nanoric 2018-10-15 04:39:39 -04:00
commit 90d25fa536
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/api/base/WebSocketClientTest.py
View File

@ -38,7 +38,7 @@ class WebsocketClientTest(unittest.TestCase):
req = { req = {
'name': 'val' 'name': 'val'
} }
self.c.sendRequest(req) self.c.sendPacket(req)
res = self.c.p.get(3) res = self.c.p.get(3)
self.assertEqual(res, req) self.assertEqual(res, req)

5
vnpy/api/websocket/WebSocketClient.py
View File

@ -55,7 +55,7 @@ class WebsocketClient(object):
self._disconnect() self._disconnect()
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def sendRequest(self, dictObj): # type: (dict)->None def sendPacket(self, dictObj): # type: (dict)->None
"""发出请求:相当于sendText(json.dumps(dictObj))""" """发出请求:相当于sendText(json.dumps(dictObj))"""
return self._get_ws().send(json.dumps(dictObj), opcode=websocket.ABNF.OPCODE_TEXT) return self._get_ws().send(json.dumps(dictObj), opcode=websocket.ABNF.OPCODE_TEXT)
@ -154,7 +154,6 @@ class WebsocketClient(object):
pass pass
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@abstractmethod
def onError(self, exceptionType, exceptionValue, tb): def onError(self, exceptionType, exceptionValue, tb):
"""Python错误回调""" """Python错误回调"""
pass return sys.excepthook(exceptionType, exceptionValue, tb)