Commits

Lynn Rees  committed 8a9c016

- fix imports

  • Participants
  • Parent commits 91164f3
  • Branches pu

Comments (0)

Files changed (14)

File callchain/__init__.py

 # -*- coding: utf-8 -*-
 '''callchain: callables and components joined in one big happy callchain'''
 
-from callchain.call import internal, internal_events
-from callchain.active_auto.chain import (
-    chainq as aachainq, callchain as aacallchain)
-from callchain.active_auto.event import (
-    eventq as aaeventq, eventchain as aaeventchain)
-from callchain.active_man.chain import (
-    chainq as amchainq, callchain as amcallchain)
-from callchain.active_man.event import (
-    eventq as ameventq, eventchain as ameventchain)
-from callchain.lazy_auto.chain import (
-    chainq as lachainq, callchain as lacallchain)
-from callchain.lazy_auto.event import (
-    eventq as laeventq, eventchain as laeventchain)
-from callchain.lazy_man.chain import (
-    chainq as lmchainq, callchain as lamcallchain)
-from callchain.lazy_man.event import (
-    eventq as lmeventq, eventchain as lmeventchain)
-from callchain.core import ResetLocalMixin, ResetTypeMixin
-from callchain.patterns import Chains, Branchways, Nameways
-from callchain.settings import DefaultSettings, RequiredSettings
+#from callchain.call import internal, internal_events
+#from callchain.active_auto.chain import (
+#    chainq as aachainq, callchain as aacallchain)
+#from callchain.active_auto.event import (
+#    eventq as aaeventq, eventchain as aaeventchain)
+#from callchain.active_man.chain import (
+#    chainq as amchainq, callchain as amcallchain)
+#from callchain.active_man.event import (
+#    eventq as ameventq, eventchain as ameventchain)
+#from callchain.lazy_auto.chain import (
+#    chainq as lachainq, callchain as lacallchain)
+#from callchain.lazy_auto.event import (
+#    eventq as laeventq, eventchain as laeventchain)
+#from callchain.lazy_man.chain import (
+#    chainq as lmchainq, callchain as lamcallchain)
+#from callchain.lazy_man.event import (
+#    eventq as lmeventq, eventchain as lmeventchain)
+#from callchain.core import ResetLocalMixin, ResetTypeMixin
+#from callchain.patterns import Chains, Branchways, Nameways
+#from callchain.settings import DefaultSettings, RequiredSettings
 
 __version__ = (0, 2, 5)

File callchain/chainlet/__init__.py

 # -*- coding: utf-8 -*-
-'''callchain service keys'''
+'''callchain chainlets'''

File callchain/key/mixin.py

 
 from appspace.keys import Attribute
 
-from callchain.key.base import KResetLocal, KCore
+from callchain.key.base import KResetLocal, KCore, KConfig
 
 
 class KChain(KResetLocal):
     '''event branch key'''
 
     E = Attribute('local event registry')
+
+
+class KEventManager(KConfig):
+
+    '''root event key'''
+
+    def event(event):  # @NoSelf
+        '''
+        create or fetch `event`
+
+        @param event: event label
+        '''
+
+    def unevent(event):  # @NoSelf
+        '''
+        drop `event`
+
+        @param event: event label
+        '''

File callchain/linked/activeauto.py

 
 from appspace import key
 from twoq.active import AutoResultMixin
-from callchain.linked.keys import KLinkedResult
+from callchain.linked.keys import KLinked, KEventLinked
 from callchain.linked.core import EventLinked, PriorityLinked, ChainLinked
 
 
-@key(KLinkedResult)
+@key(KLinked)
 class chainlink(ChainLinked, AutoResultMixin):
 
     '''linked chain'''
 
 
-@key(KLinkedResult)
+@key(KLinked)
 class prioritylink(PriorityLinked, AutoResultMixin):
 
     '''priority linked chain'''
 
 
-@key(KLinkedResult)
+@key(KEventLinked)
 class eventlink(EventLinked, AutoResultMixin):
 
     '''lite linked event chain'''

File callchain/linked/activeman.py

 
 from appspace import key
 from twoq.active import ManResultMixin
-from callchain.linked.keys import KLinkedResult
+from callchain.linked.keys import KLinked, KEventLinked
 from callchain.linked.core import EventLinked, PriorityLinked, ChainLinked
 
 
-@key(KLinkedResult)
+@key(KLinked)
 class chainlink(ChainLinked, ManResultMixin):
 
     '''linked chain'''
 
 
-@key(KLinkedResult)
+@key(KLinked)
 class prioritylink(PriorityLinked, ManResultMixin):
 
     '''priority linked chain'''
 
 
-@key(KLinkedResult)
+@key(KEventLinked)
 class eventlink(EventLinked, ManResultMixin):
 
     '''lite linked event chain'''

File callchain/linked/keys.py

 '''callchain contrib keys'''
 
 from callchain.key.base import KConfig
-from callchain.key.queue import KResult, KThings
-from callchain.key.mixin import KCall, KChain, KBranch
+from callchain.key.queue import KResult
+from callchain.key.mixin import KCall, KChain, KBranch, KEventCall, KEvent
 
 
-class KLinked(KBranch, KConfig, KCall, KChain):
+class KLinked(KBranch, KConfig, KCall, KChain, KResult):
 
-    '''linked chain mixin'''
+    '''linked chain with results key'''
 
     def close():  # @NoSelf
         '''close out linked chain and switch to root chain'''
 
 
-class KLinkedThings(KLinked, KThings):
+class KEventLinked(KBranch, KConfig, KEventCall, KEvent, KResult):
 
-    '''linked chain with things key'''
-
-
-class KLinkedResult(KLinked, KResult):
-
-    '''linked chain with results key'''
+    '''linked event chain with results key'''

File callchain/linked/lazyauto.py

 
 from appspace import key
 from twoq.lazy import AutoResultMixin
-from callchain.linked.keys import KLinkedResult
+from callchain.linked.keys import KLinked, KEventLinked
 from callchain.linked.core import EventLinked, PriorityLinked, ChainLinked
 
 
-@key(KLinkedResult)
+@key(KLinked)
 class chainlink(ChainLinked, AutoResultMixin):
 
     '''linked chain'''
 
 
-@key(KLinkedResult)
+@key(KLinked)
 class prioritylink(PriorityLinked, AutoResultMixin):
 
     '''priority linked chain'''
 
 
-@key(KLinkedResult)
+@key(KEventLinked)
 class eventlink(EventLinked, AutoResultMixin):
 
     '''lite linked event chain'''

File callchain/linked/lazyman.py

 
 from appspace import key
 from twoq.lazy import ManResultMixin
-from callchain.linked.keys import KLinkedResult
+from callchain.linked.keys import KLinked, KEventLinked
 from callchain.linked.core import EventLinked, PriorityLinked, ChainLinked
 
 
-@key(KLinkedResult)
+@key(KLinked)
 class chainlink(ChainLinked, ManResultMixin):
 
     '''linked chain'''
 
 
-@key(KLinkedResult)
+@key(KLinked)
 class prioritylink(PriorityLinked, ManResultMixin):
 
     '''priority linked chain'''
 
 
-@key(KLinkedResult)
+@key(KEventLinked)
 class eventlink(EventLinked, ManResultMixin):
 
     '''lite linked event chain'''

File callchain/root/activeauto.py

 from appspace import key
 from twoq.active import AutoResultMixin
 
-from callchain.key.mixin import KEvent
 from callchain.route import Chains, Events
 from callchain.mixin import ChainMixin, PriorityMixin, EventMixin
 
 from callchain.root.settings import Defaults
-from callchain.root.keys import KRootResults
+from callchain.root.keys import KRoot, KEventRoot
 from callchain.root.core import RootMixin, EventRootMixin
 from callchain.root.apps import thingchain, thingevent, chain, events
 
 thingevent = Events(thingevent).events(events).defaults(Defaults)
 
 
-@key(KRootResults)
+@key(KRoot)
 @thingchain
 class callchain(RootMixin, ChainMixin, AutoResultMixin):
 
     '''active queued auto-balancing lite call chain'''
 
 
-@key(KRootResults)
+@key(KRoot)
 @thingchain
 class prioritychain(RootMixin, PriorityMixin, AutoResultMixin):
 
     '''active priority queued auto-balancing lite call chain'''
 
 
-@key(KEvent)
+@key(KEventRoot)
 @thingevent
 class eventchain(EventRootMixin, EventMixin, AutoResultMixin):
 
 event = Events(eventqueue).events(events).defaults(Defaults)
 
 
-@key(KRootResults)
+@key(KRoot)
 @chain
 class chainq(RootMixin, ChainMixin, AutoResultMixin):
 
     '''active queued auto-balancing call chain'''
 
 
-@key(KRootResults)
+@key(KRoot)
 @chain
 class priorityq(RootMixin, PriorityMixin, AutoResultMixin):
 
     '''active priority queued auto-balancing lite call chain'''
 
 
-@key(KEvent)
+@key(KEventRoot)
 @event
 class eventq(EventRootMixin, EventMixin, AutoResultMixin):
 

File callchain/root/activeman.py

 from appspace import key
 from twoq.active import ManResultMixin
 
-from callchain.key.mixin import KEvent
 from callchain.route import Chains, Events
 from callchain.mixin import ChainMixin, PriorityMixin, EventMixin
 
 from callchain.root.settings import Defaults
-from callchain.root.keys import KRootResults
+from callchain.root.keys import KRoot, KEventRoot
 from callchain.root.core import RootMixin, EventRootMixin
 from callchain.root.apps import thingchain, thingevent, chain, events
 
 thingevent = Events(thingevent).events(events).defaults(Defaults)
 
 
-@key(KRootResults)
+@key(KRoot)
 @thingchain
 class callchain(RootMixin, ChainMixin, ManResultMixin):
 
     '''active queued manually balanced lite call chain'''
 
 
-@key(KRootResults)
+@key(KRoot)
 @thingchain
 class prioritychain(RootMixin, PriorityMixin, ManResultMixin):
 
     '''active priority queued manually balanced lite call chain'''
 
 
-@key(KEvent)
+@key(KEventRoot)
 @thingevent
 class eventchain(EventRootMixin, EventMixin, ManResultMixin):
 
 event = Events(eventqueue).events(events).defaults(Defaults)
 
 
-@key(KRootResults)
+@key(KRoot)
 @chain
 class chainq(RootMixin, ChainMixin, ManResultMixin):
 
     '''active queued manually balanced call chain'''
 
 
-@key(KRootResults)
+@key(KRoot)
 @chain
 class priorityq(RootMixin, PriorityMixin, ManResultMixin):
 
     '''active priority queued manually balanced lite call chain'''
 
 
-@key(KEvent)
+@key(KEventRoot)
 @event
 class eventq(EventRootMixin, EventMixin, ManResultMixin):
 

File callchain/root/keys.py

 '''callchain contrib keys'''
 
 from callchain.key.base import KConfig
-from callchain.key.mixin import KCall, KChain
-from callchain.key.queue import KResult, KThings
+from callchain.key.queue import KResult
+from callchain.key.mixin import KCall, KChain, KEvent, KEventCall
 
 
-class KEventManager(KConfig):
-
-    '''root event key'''
-
-    def event(event):  # @NoSelf
-        '''
-        create or fetch `event`
-
-        @param event: event label
-        '''
-
-    def unevent(event):  # @NoSelf
-        '''
-        drop `event`
-
-        @param event: event label
-        '''
-
-
-class KRoot(KConfig, KChain, KCall):
+class KRoot(KConfig, KChain, KCall, KResult):
 
     '''root chain key'''
 
         '''
 
 
-class KRootThings(KRoot, KThings):
+class KEventRoot(KConfig, KEventCall, KEvent, KResult):
 
-    '''root chain with results'''
-
-
-class KRootResults(KRoot, KResult):
-
-    '''root chain with results'''
+    '''root event chain key'''

File callchain/root/lazyauto.py

 from appspace import key
 from twoq.lazy import AutoResultMixin
 
-from callchain.key.mixin import KEvent
 from callchain.route import Chains, Events
 from callchain.mixin import ChainMixin, PriorityMixin, EventMixin
 
 from callchain.root.settings import Defaults
-from callchain.root.keys import KRootResults
+from callchain.root.keys import KRoot, KEventRoot
 from callchain.root.core import RootMixin, EventRootMixin
 from callchain.root.apps import thingchain, thingevent, chain, events
 
 thingevent = Events(thingevent).events(events).defaults(Defaults)
 
 
-@key(KRootResults)
+@key(KRoot)
 @thingchain
 class callchain(RootMixin, ChainMixin, AutoResultMixin):
 
     '''lazy queued auto-balancing lite call chain'''
 
 
-@key(KRootResults)
+@key(KRoot)
 @thingchain
 class prioritychain(RootMixin, PriorityMixin, AutoResultMixin):
 
     '''lazy priority queued auto-balancing lite call chain'''
 
 
-@key(KEvent)
+@key(KEventRoot)
 @thingevent
 class eventchain(EventRootMixin, EventMixin, AutoResultMixin):
 
 event = Events(eventqueue).events(events).defaults(Defaults)
 
 
-@key(KRootResults)
+@key(KRoot)
 @chain
 class chainq(RootMixin, ChainMixin, AutoResultMixin):
 
     '''lazy queued auto-balancing call chain'''
 
 
-@key(KRootResults)
+@key(KRoot)
 @chain
 class priorityq(RootMixin, PriorityMixin, AutoResultMixin):
 
     '''lazy priority queued auto-balancing lite call chain'''
 
 
-@key(KEvent)
+@key(KEventRoot)
 @event
 class eventq(EventRootMixin, EventMixin, AutoResultMixin):
 

File callchain/root/lazyman.py

 from appspace import key
 from twoq.lazy import ManResultMixin
 
-from callchain.key.mixin import KEvent
-
 from callchain.route import Chains, Events
 from callchain.mixin import ChainMixin, PriorityMixin, EventMixin
 
 from callchain.root.settings import Defaults
-from callchain.root.keys import KRootResults
+from callchain.root.keys import KRoot, KEventRoot
 from callchain.root.core import RootMixin, EventRootMixin
 from callchain.root.apps import thingchain, thingevent, chain, events
 
 thingevent = Events(thingevent).events(events).defaults(Defaults)
 
 
-@key(KRootResults)
+@key(KRoot)
 @thingchain
 class callchain(RootMixin, ChainMixin, ManResultMixin):
 
     '''lazy queued manually balanced lite call chain'''
 
 
-@key(KRootResults)
+@key(KRoot)
 @thingchain
 class prioritychain(RootMixin, PriorityMixin, ManResultMixin):
 
     '''lazy priority queued manually balanced lite call chain'''
 
 
-@key(KEvent)
+@key(KEventRoot)
 @thingevent
 class eventchain(EventRootMixin, EventMixin, ManResultMixin):
 
 event = Events(eventqueue).events(events).defaults(Defaults)
 
 
-@key(KRootResults)
+@key(KRoot)
 @chain
 class chainq(RootMixin, ChainMixin, ManResultMixin):
 
     '''lazy queued manually balanced call chain'''
 
 
-@key(KRootResults)
+@key(KRoot)
 @chain
 class priorityq(RootMixin, PriorityMixin, ManResultMixin):
 
     '''lazy priority queued manually balanced lite call chain'''
 
 
-@key(KEvent)
+@key(KEventRoot)
 @event
 class eventq(EventRootMixin, EventMixin, ManResultMixin):
 
 callchain
-callchain.keys
-callchain.chainlets
-callchain.lazy_auto
-callchain.lazy_man
-callchain.active_man
-callchain.active_auto
+callchain.chainlet
+callchain.key
+callchain.linked
+callchain.queue
+callchain.queue.activeauto
+callchain.queue.activeman
+callchain.queue.lazyauto
+callchain.queue.lazyman
+callchain.root