summaryrefslogtreecommitdiff
path: root/src/leap/common/events
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-07-25 15:20:33 -0300
committerdrebs <drebs@leap.se>2013-07-25 15:20:33 -0300
commitdcb71ea078a7f56f76bf84b352656cdfa252d677 (patch)
tree15354325e5997a119a6b24d70a4891c3c586e44c /src/leap/common/events
parentc22072f6a12a9d896eb324a848043011b0ea30c5 (diff)
Fix events doc about reqcbk signature. Closes #3261
Diffstat (limited to 'src/leap/common/events')
-rw-r--r--src/leap/common/events/__init__.py8
-rw-r--r--src/leap/common/events/client.py8
-rw-r--r--src/leap/common/events/server.py2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/leap/common/events/__init__.py b/src/leap/common/events/__init__.py
index a6fe7c3..6eaf3d4 100644
--- a/src/leap/common/events/__init__.py
+++ b/src/leap/common/events/__init__.py
@@ -130,7 +130,7 @@ def unregister(signal, uid=None, reqcbk=None, timeout=1000):
:type uid: int
:param reqcbk: a callback to be called when a response from server is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.UnregisterRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int
@@ -162,7 +162,7 @@ def signal(signal, content="", mac_method="", mac="", reqcbk=None,
:type mac: str
:param reqcbk: a callback to be called when a response from server is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.SignalRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int
@@ -180,7 +180,7 @@ def ping_client(port, reqcbk=None, timeout=1000):
:type port: int
:param reqcbk: a callback to be called when a response from client is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.PingRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int
"""
@@ -195,7 +195,7 @@ def ping_server(port=server.SERVER_PORT, reqcbk=None, timeout=1000):
:type port: int
:param reqcbk: a callback to be called when a response from server is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.PingRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int
"""
diff --git a/src/leap/common/events/client.py b/src/leap/common/events/client.py
index 55f14ab..4ae9bff 100644
--- a/src/leap/common/events/client.py
+++ b/src/leap/common/events/client.py
@@ -102,7 +102,7 @@ def register(signal, callback, uid=None, replace=False, reqcbk=None,
:type replace: bool
:param reqcbk: a callback to be called when a response from server is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.RegisterRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int
@@ -152,7 +152,7 @@ def unregister(signal, uid=None, reqcbk=None, timeout=1000):
:type uid: int
:param reqcbk: a callback to be called when a response from server is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.UnregisterRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int
@@ -211,7 +211,7 @@ def signal(signal, content="", mac_method="", mac="", reqcbk=None,
:type mac: str
:param reqcbk: a callback to be called when a response from server is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.SignalRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int
@@ -238,7 +238,7 @@ def ping(port, reqcbk=None, timeout=1000):
:type port: int
:param reqcbk: a callback to be called when a response from client is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.PingRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int
diff --git a/src/leap/common/events/server.py b/src/leap/common/events/server.py
index a7d4da9..59f3454 100644
--- a/src/leap/common/events/server.py
+++ b/src/leap/common/events/server.py
@@ -98,7 +98,7 @@ def ping(port=SERVER_PORT, reqcbk=None, timeout=1000):
:type port: int
:param reqcbk: a callback to be called when a response from server is
received
- :type reqcbk: function(leap.common.events.events_pb2.EventResponse)
+ :type reqcbk: function(proto.PingRequest, proto.EventResponse)
:param timeout: the timeout for synch calls
:type timeout: int