Commits

Lynn Rees committed 49cb477

- fix paths

Comments (0)

Files changed (5)

callchain/root/activeauto.py

 
 from callchain.root.core import RootMixin, EventRootMixin
 from callchain.root.keys import KRootResults, KRootThings
-from callchain.root.apps import thingchain, thingevent, chain, event, events
+from callchain.root.apps import thingchain, thingevent, chain, events
 
 thingchain = Chains(thingchain).defaults(Defaults)
 thingevent = Events(thingevent).events(events).defaults(Defaults)
     prefix = 'callchain.chainlet.activeauto.chainlet'
 
 
-class eventqueue(event):
+class eventqueue(chain):
     prefix = 'callchain.chainlet.activeauto.eventlet'
     chain = 'callchain.chainlet.activeauto.chainlet.chainlink'
 

callchain/root/activeman.py

 
 from callchain.root.core import RootMixin, EventRootMixin
 from callchain.root.keys import KRootResults, KRootThings
-from callchain.root.apps import thingchain, thingevent, chain, event, events
+from callchain.root.apps import thingchain, thingevent, chain, events
 
 thingchain = Chains(thingchain).defaults(Defaults)
 thingevent = Events(thingevent).events(events).defaults(Defaults)
     prefix = 'callchain.chainlet.activeman.chainlet'
 
 
-class eventqueue(event):
+class eventqueue(chain):
     prefix = 'callchain..chainlet.activeman.eventlet'
     chain = 'callchain.chainlet.activeman.chainlet.chainlink'
 

callchain/root/apps.py

 
 
 class thingchain:
-    prefix = 'callchain.chainlet'
-    dumps = 'dumps.Dumps'
-    loads = 'loads.Loads'
-    logger = 'core.loglet'
+    class chainlet:
+        prefix = 'callchain.chainlet'
+        dumps = 'dumps.Dumps'
+        loads = 'loads.Loads'
+        logger = 'core.loglet'
+    settings = 'callchain.settings.Settings'
+    queue = 'twoq.twoq'
+    port = 'twoq.port'
 
 
 class chain(thingchain):
     truth = 'truthlet'
 
 
-class event:
-    filter = 'filterlet'
-    collect = 'collectlet'
-    combine = 'combinelet'
-    set = 'setlet'
-    slice = 'slicelet'
-    map = 'maplet'
-    delay = 'delaylet'
-    repeat = 'repeatlet'
-    order = 'orderlet'
-    random = 'randomlet'
-    reduce = 'reducelet'
-    math = 'mathlet'
-    truth = 'truthlet'
-
-
 class events:
     key = 'callchain.keys.event.EEvent'
     # 1. before event
     anyway = 'callchain.keys.event.EAnyway'
 
 
-class thingevent:
-
-    class chainlets:
-        prefix = 'callchain.chainlets'
-        loads = 'loads.Loads'
-        dumps = 'dumps.Dumps'
-        logger = 'core.loglet'
+class thingevent(thingchain):
+    E = 'callchain.chainlet.registry.EventRegistry'
 
 
 class lookups:
     _sum = 'builtins.sum'
     _truediv = 'operator.truediv'
     _zip = 'six.moves.zip'
-
-
-class chaincore:
-    _settings = 'callchain.settings.Settings'
-    _queue = 'twoq.twoq'
-    _porting = 'twoq.port'
-    _E = 'callchain.chainlet.registry.EventRegistry'

callchain/root/lazyauto.py

 
 from callchain.root.core import RootMixin, EventRootMixin
 from callchain.root.keys import KRootResults, KRootThings
-from callchain.root.apps import thingchain, thingevent, chain, event, events
+from callchain.root.apps import thingchain, thingevent, chain, events
 
 thingchain = Chains(thingchain).defaults(Defaults)
 thingevent = Events(thingevent).events(events).defaults(Defaults)
     prefix = 'callchain.chainlet.lazyauto.chainlet'
 
 
-class eventqueue(event):
+class eventqueue(chain):
     prefix = 'callchain.chainlet.lazyauto.eventlet'
     chain = 'callchain.chainlet.lazyauto.chainlet.chainlink'
 

callchain/root/lazyman.py

 
 from callchain.root.core import RootMixin, EventRootMixin
 from callchain.root.keys import KRootResults, KRootThings
-from callchain.root.apps import thingchain, thingevent, chain, event, events
+from callchain.root.apps import thingchain, thingevent, chain, events
 
 thingchain = Chains(thingchain).defaults(Defaults)
 thingevent = Events(thingevent).events(events).defaults(Defaults)
     prefix = 'callchain.chainlet.lazyman.chainlet'
 
 
-class eventqueue(event):
+class eventqueue(chain):
     prefix = 'callchain.chainlet.lazyman.eventlet'
     chain = 'callchain.chainlet.lazyman.chainlet.chainlink'