schema.py
changeset 10612 84468b90e9c1
parent 10609 e2d8e81bfe68
child 10653 42c5bd7286b7
--- a/schema.py	Wed Sep 16 11:23:51 2015 +0200
+++ b/schema.py	Mon Sep 14 16:03:07 2015 +0200
@@ -26,6 +26,7 @@
 from logging import getLogger
 from warnings import warn
 
+from six import string_types
 from six.moves import range
 
 from logilab.common import tempattr
@@ -207,7 +208,7 @@
         """
         self.eid = eid # eid of the entity representing this rql expression
         assert mainvars, 'bad mainvars %s' % mainvars
-        if isinstance(mainvars, basestring):
+        if isinstance(mainvars, string_types):
             mainvars = set(splitstrip(mainvars))
         elif not isinstance(mainvars, set):
             mainvars = set(mainvars)
@@ -579,7 +580,7 @@
     assert action in self.ACTIONS, action
     #assert action in self._groups, '%s %s' % (self, action)
     try:
-        return frozenset(g for g in self.permissions[action] if isinstance(g, basestring))
+        return frozenset(g for g in self.permissions[action] if isinstance(g, string_types))
     except KeyError:
         return ()
 PermissionMixIn.get_groups = get_groups
@@ -598,7 +599,7 @@
     assert action in self.ACTIONS, action
     #assert action in self._rqlexprs, '%s %s' % (self, action)
     try:
-        return tuple(g for g in self.permissions[action] if not isinstance(g, basestring))
+        return tuple(g for g in self.permissions[action] if not isinstance(g, string_types))
     except KeyError:
         return ()
 PermissionMixIn.get_rqlexprs = get_rqlexprs