diff -r f4dec0cca9a1 -r 84468b90e9c1 test/unittest_rset.py --- a/test/unittest_rset.py Wed Sep 16 11:23:51 2015 +0200 +++ b/test/unittest_rset.py Mon Sep 14 16:03:07 2015 +0200 @@ -18,6 +18,7 @@ # with CubicWeb. If not, see . """unit tests for module cubicweb.utils""" +from six import string_types from six.moves import cPickle as pickle from six.moves.urllib.parse import urlsplit @@ -552,17 +553,17 @@ def test_str(self): with self.admin_access.web_request() as req: rset = req.execute('(Any X,N WHERE X is CWGroup, X name N)') - self.assertIsInstance(str(rset), basestring) + self.assertIsInstance(str(rset), string_types) self.assertEqual(len(str(rset).splitlines()), 1) def test_repr(self): with self.admin_access.web_request() as req: rset = req.execute('(Any X,N WHERE X is CWGroup, X name N)') - self.assertIsInstance(repr(rset), basestring) + self.assertIsInstance(repr(rset), string_types) self.assertTrue(len(repr(rset).splitlines()) > 1) rset = req.execute('(Any X WHERE X is CWGroup, X name "managers")') - self.assertIsInstance(str(rset), basestring) + self.assertIsInstance(str(rset), string_types) self.assertEqual(len(str(rset).splitlines()), 1) def test_nonregr_symmetric_relation(self):