Commits

Lynn Rees committed 92726be

- fix prompting

Comments (0)

Files changed (8)

graphalchemy/apps.py

 # -*- coding: utf-8 -*-
 '''graphalchemy appconf'''
 
-from spine import Pathways
-from appspace import Branch, Namespace
+from callchain import Pathways, Branchways, Nameways
 
 __all__ = ['graphalchemy']
 
 
 class graphalchemy(Pathways):
 
-    class include(Branch):
+    class include(Branchways):
         backends = 'graphalchemy.backends.apps'
         directs = 'graphalchemy.direct.apps'
         models = 'graphalchemy.models.apps'
 
-    class session(Namespace):
+    class session(Nameways):
         master = 'graphalchemy.sessions.Session'

graphalchemy/backends/apps.py

 # -*- coding: utf-8 -*-
 '''graphalchemy backends appconf'''
 
-from spine import Pathways
+from callchain import Pathways
 from appspace import Namespace
 
 __all__ = ['appconf']

graphalchemy/core.py

 # -*- coding: utf-8 -*-
 '''graphalchemy core'''
 
-from spine import Spine
+from spine.core import Spine
 
 from graphalchemy.apps import graphalchemy
 from graphalchemy.settings import Defaults, Required

graphalchemy/direct/apps.py

 # -*- coding: utf-8 -*-
 '''graph direct appconf'''
 
-from spine import Pathways
+from callchain import Pathways
 from appspace import Namespace
 
 __all__ = ['appconf']

graphalchemy/direct/elements.py

 conf = octopus.G
 
 
-class Thing(ElementMixin, octopus.process.Thing):
+class Thing(ElementMixin, octopus.workflow.Thing):
 
     '''graph object'''
 

graphalchemy/direct/workers.py

 db = conf.key.db
 
 
-class _Direct(WriterMixin, ReaderMixin, octopus.process.Worker):
+class _Direct(WriterMixin, ReaderMixin, octopus.workflow.Worker):
 
     '''direct graph database interface'''
 

graphalchemy/models/apps.py

 # -*- coding: utf-8 -*-
 '''graph models appconf'''
 
-from spine import Pathways
+from callchain import Pathways
 from appspace import Namespace
 
 __all__ = ['appconf']

graphalchemy/properties.py

 import sys
 
 from spine.traits import Trait
-from spine.bases.keys import NoDefault
-from spine.traits import CheckedUnicode, Bool, Float as Ft, Integer, Unicode
+from spine.keys.core import NoDefault
+from spine.traits import Regex, Bool, Float as Ft, Integer, Unicode
 
 __all__ = (
     'BooleanField', 'CharField', 'FloatField', 'IntegerField', 'StringField',
     '''boolean field'''
 
 
-class CharField(StringMixin, CheckedUnicode):
+class CharField(StringMixin, Regex):
 
     '''checked string field'''