diff -r f4dec0cca9a1 -r 84468b90e9c1 devtools/testlib.py --- a/devtools/testlib.py Wed Sep 16 11:23:51 2015 +0200 +++ b/devtools/testlib.py Mon Sep 14 16:03:07 2015 +0200 @@ -28,6 +28,7 @@ from warnings import warn from itertools import chain +from six import string_types from six.moves import range from six.moves.urllib.parse import urlparse, parse_qs, unquote as urlunquote @@ -521,7 +522,7 @@ """ torestore = [] for erschema, etypeperms in chain(perm_overrides, perm_kwoverrides.iteritems()): - if isinstance(erschema, basestring): + if isinstance(erschema, string_types): erschema = self.schema[erschema] for action, actionperms in etypeperms.iteritems(): origperms = erschema.permissions[action]