summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2011-03-30 22:00:52 +0200
committerNicolas Schodet2011-03-30 22:12:07 +0200
commitfe0373d1b63e21a2f1d04339b30f535e6c969d87 (patch)
tree15d332802a9080dcd3dc444b08a2b12806420f54
parent057180987cacfe47edbe21bf2f8c0573901ded2f (diff)
host/mex: accept a string to Node.register, refs #157
-rw-r--r--host/mex/node.py2
-rw-r--r--host/mex/test/test.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/host/mex/node.py b/host/mex/node.py
index a1f226cd..50e77709 100644
--- a/host/mex/node.py
+++ b/host/mex/node.py
@@ -119,6 +119,8 @@ class Node:
def register (self, mtype, handler):
"""Register an handler for the given message type."""
+ if isinstance (mtype, basestring):
+ mtype = self.reserve (mtype)
assert mtype not in self.__handlers
self.__handlers[mtype] = handler
diff --git a/host/mex/test/test.py b/host/mex/test/test.py
index 91e49ee0..dec53b1d 100644
--- a/host/mex/test/test.py
+++ b/host/mex/test/test.py
@@ -35,7 +35,6 @@ h = Hub (min_clients = 2, log = log)
def c1 ():
n = Node ()
- mtype_oucouc = n.reserve ('oucouc')
mtype_coucou = n.reserve ('coucou')
def a (msg):
print 'oucouc'
@@ -44,7 +43,7 @@ def c1 ():
m = Msg (msg.mtype)
m.push ('B', nb)
n.response (m)
- n.register (mtype_oucouc, a)
+ n.register ('oucouc', a)
def b ():
assert False
eb = n.schedule (31, b)