diff options
Diffstat (limited to 'Lib/test/test_grp.py')
| -rw-r--r-- | Lib/test/test_grp.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py index e9e17582636..04a8af6ac9b 100644 --- a/Lib/test/test_grp.py +++ b/Lib/test/test_grp.py @@ -1,9 +1,9 @@ """Test script for the grp module.""" import unittest -from test import test_support +from test import support -grp = test_support.import_module('grp') +grp = support.import_module('grp') class GroupDatabaseTestCase(unittest.TestCase): @@ -12,9 +12,9 @@ class GroupDatabaseTestCase(unittest.TestCase): # attributes promised by the docs self.assertEqual(len(value), 4) self.assertEqual(value[0], value.gr_name) - self.assertIsInstance(value.gr_name, basestring) + self.assertIsInstance(value.gr_name, str) self.assertEqual(value[1], value.gr_passwd) - self.assertIsInstance(value.gr_passwd, basestring) + self.assertIsInstance(value.gr_passwd, str) self.assertEqual(value[2], value.gr_gid) self.assertIsInstance(value.gr_gid, int) self.assertEqual(value[3], value.gr_mem) @@ -58,12 +58,12 @@ class GroupDatabaseTestCase(unittest.TestCase): bynames[n] = g bygids[g] = n - allnames = bynames.keys() + allnames = list(bynames.keys()) namei = 0 fakename = allnames[namei] while fakename in bynames: chars = list(fakename) - for i in xrange(len(chars)): + for i in range(len(chars)): if chars[i] == 'z': chars[i] = 'A' break @@ -91,7 +91,7 @@ class GroupDatabaseTestCase(unittest.TestCase): self.assertRaises(KeyError, grp.getgrgid, fakegid) def test_main(): - test_support.run_unittest(GroupDatabaseTestCase) + support.run_unittest(GroupDatabaseTestCase) if __name__ == "__main__": test_main() |