Commits

Lynn Rees committed 122b5b8

- fix paths

Comments (0)

Files changed (3)

graphalchemy/__init__.py

 
 from inspect import ismodule
 
-from stuf.six import iteritems
+from twoq import port
 
 __version__ = (0, 1, 0)
 
-__all__ = sorted(name for name, obj in iteritems(locals()) if not any([
+__all__ = sorted(name for name, obj in port.items(locals()) if not any([
     name.startswith('_'), ismodule(obj)]
 ))

graphalchemy/backends/neo4jem.py

 
 from inspect import ismodule
 
-from stuf.six import iteritems
+from twoq import port
 from lucenequerybuilder import Q
 from stuf.utils import getdefault
 
         def R(k, v):
             return Q(k, v, wildcard=True)
         qs = None
-        for k, v in iteritems(kw):
+        for k, v in port.items(kw):
             qs = qs & R(k, v) if qs is not None else R(k, v)
         return qs
 
         def R(k, v):
             return -Q(k, v, wildcard=True)
         qs = None
-        for k, v in iteritems(kw):
+        for k, v in port.items(kw):
             qs = qs & R(k, v) if qs is not None else R(k, v)
         return qs
 
 
         def R(k, v):
             return Q(k, v, wildcard=True)
-        for k, v in iteritems(kw):
+        for k, v in port.items(kw):
             qs = qs | R(k, v) if qs is not None else R(k, v)
         return qs
 
 
         def R(k, v):
             return -Q(k, v, wildcard=True)
-        for k, v in iteritems(kw):
+        for k, v in port.items(kw):
             qs = qs | R(k, v) if qs is not None else R(k, v)
         return qs
 
         @param callback: callback (default: None)
         '''
         element = this.source
-        for k, v in iteritems(data):
+        for k, v in port.items(data):
             element[k] = v
         if callback is not None:
             callback(element)
         element.delete()
 
 
-__all__ = sorted(name for name, obj in iteritems(locals()) if not any([
+__all__ = sorted(name for name, obj in port.items(locals()) if not any([
     name.startswith('_'), ismodule(obj)]
 ))

graphalchemy/models/finders.py

 # -*- coding: utf-8 -*-
 '''graph model finder'''
 
+from twoq import port
 from appspace import NoAppError
-from stuf.six import string_types
 
 from graphalchemy.core import octopus, join
 
                 return self.Q.app(element['_model'], self.G.userspace)
             except (NoAppError, KeyError):
                 pass
-        elif isinstance(model, string_types):
+        elif port.isstring(model):
             return self.Q.app(model, self.G.userspace)
         return model if model else self.model