update to match new (private) Automat tracing API

src/wormhole/_allocator.py

@@ -10,7 +10,7 @@ from . import _interfaces
 class Allocator(object):
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def wire(self, rendezvous_connector, code):
         self._RC = _interfaces.IRendezvousConnector(rendezvous_connector)

src/wormhole/_boss.py

@@ -39,7 +39,7 @@ class Boss(object):
     _tor_manager = attrib() # TODO: ITorManager or None
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __attrs_post_init__(self):
         self._build_workers()
@@ -92,8 +92,7 @@ class Boss(object):
                  "RC": self._RC, "L": self._L, "C": self._C,
                  "T": self._T}
         for machine in which.split():
-            def tracer(old_state, input, new_state, output, machine=machine):
+            def tracer(old_state, input, new_state, machine=machine):
-                if output is None:
                 if new_state:
                     print("%s.%s[%s].%s -> [%s]" %
                           (client_name, machine, old_state, input,
@@ -106,11 +105,12 @@ class Boss(object):
                     # phase), R.lost .
                     print("%s.%s.%s" % (client_name, machine, input),
                           file=file)
-                else:
+                file.flush()
-                    if new_state:
+                def output_tracer(output):
                     print(" %s.%s.%s()" % (client_name, machine, output),
                           file=file)
                     file.flush()
+                return output_tracer
             names[machine].set_trace(tracer)
 
     ## def serialize(self):

src/wormhole/_code.py

@@ -13,7 +13,7 @@ def first(outputs):
 class Code(object):
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def wire(self, boss, allocator, nameplate, key, input):
         self._B = _interfaces.IBoss(boss)

src/wormhole/_input.py

@@ -14,7 +14,7 @@ def first(outputs):
 class Input(object):
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __attrs_post_init__(self):
         self._all_nameplates = set()

src/wormhole/_key.py

@@ -64,7 +64,7 @@ class Key(object):
     _side = attrib(validator=instance_of(type(u"")))
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __attrs_post_init__(self):
         self._SK = _SortedKey(self._appid, self._versions, self._side,
@@ -115,7 +115,7 @@ class _SortedKey(object):
     _side = attrib(validator=instance_of(type(u"")))
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def wire(self, boss, mailbox, receive):
         self._B = _interfaces.IBoss(boss)

src/wormhole/_lister.py

@@ -10,7 +10,7 @@ from . import _interfaces
 class Lister(object):
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def wire(self, rendezvous_connector, input):
         self._RC = _interfaces.IRendezvousConnector(rendezvous_connector)

src/wormhole/_mailbox.py

@@ -10,7 +10,7 @@ from . import _interfaces
 class Mailbox(object):
     _side = attrib(validator=instance_of(type(u"")))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __attrs_post_init__(self):
         self._mailbox = None

src/wormhole/_nameplate.py

@@ -7,7 +7,7 @@ from ._wordlist import PGPWordList
 @implementer(_interfaces.INameplate)
 class Nameplate(object):
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __init__(self):
         self._nameplate = None

src/wormhole/_order.py

@@ -11,7 +11,7 @@ class Order(object):
     _side = attrib(validator=instance_of(type(u"")))
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __attrs_post_init__(self):
         self._key = None

src/wormhole/_receive.py

@@ -12,7 +12,7 @@ class Receive(object):
     _side = attrib(validator=instance_of(type(u"")))
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __attrs_post_init__(self):
         self._key = None

src/wormhole/_rendezvous.py

@@ -83,7 +83,7 @@ class RendezvousConnector(object):
         self._trace = f
     def _debug(self, what):
         if self._trace:
-            self._trace(old_state="", input=what, new_state="", output=None)
+            self._trace(old_state="", input=what, new_state="")
 
     def _make_endpoint(self, hostname, port):
         if self._tor_manager:

src/wormhole/_send.py

@@ -12,7 +12,7 @@ class Send(object):
     _side = attrib(validator=instance_of(type(u"")))
     _timing = attrib(validator=provides(_interfaces.ITiming))
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __attrs_post_init__(self):
         self._queue = []

src/wormhole/_terminator.py

@@ -6,7 +6,7 @@ from . import _interfaces
 @implementer(_interfaces.ITerminator)
 class Terminator(object):
     m = MethodicalMachine()
-    set_trace = getattr(m, "setTrace", lambda self, f: None)
+    set_trace = getattr(m, "_setTrace", lambda self, f: None)
 
     def __init__(self):
         self._mood = None