diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-03-23 20:40:36 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-03-23 20:40:36 (GMT) |
| commit | 01d9a775fae9f09dc185d2a6d4790adafc303a25 (patch) | |
| tree | 7733199e543f37cc7f153750de1fea5c5ddfec5f | |
| parent | 4d7fc3c5ac0d09a83a02cc35788ea1b806866ad9 (diff) | |
| download | cpython-01d9a775fae9f09dc185d2a6d4790adafc303a25.zip cpython-01d9a775fae9f09dc185d2a6d4790adafc303a25.tar.gz cpython-01d9a775fae9f09dc185d2a6d4790adafc303a25.tar.bz2 | |
group ids and user ids can be longs now (#17531)
| -rw-r--r-- | Lib/test/test_grp.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_pwd.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py index e9e1758..62d2baf 100644 --- a/Lib/test/test_grp.py +++ b/Lib/test/test_grp.py @@ -16,7 +16,7 @@ class GroupDatabaseTestCase(unittest.TestCase): self.assertEqual(value[1], value.gr_passwd) self.assertIsInstance(value.gr_passwd, basestring) self.assertEqual(value[2], value.gr_gid) - self.assertIsInstance(value.gr_gid, int) + self.assertIsInstance(value.gr_gid, (long, int)) self.assertEqual(value[3], value.gr_mem) self.assertIsInstance(value.gr_mem, list) diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py index ce8b8b3..696161a 100644 --- a/Lib/test/test_pwd.py +++ b/Lib/test/test_pwd.py @@ -18,9 +18,9 @@ class PwdTest(unittest.TestCase): self.assertEqual(e[1], e.pw_passwd) self.assertIsInstance(e.pw_passwd, basestring) self.assertEqual(e[2], e.pw_uid) - self.assertIsInstance(e.pw_uid, int) + self.assertIsInstance(e.pw_uid, (int, long)) self.assertEqual(e[3], e.pw_gid) - self.assertIsInstance(e.pw_gid, int) + self.assertIsInstance(e.pw_gid, (int, long)) self.assertEqual(e[4], e.pw_gecos) self.assertIsInstance(e.pw_gecos, basestring) self.assertEqual(e[5], e.pw_dir) @@ -9,7 +9,8 @@ What's New in Python 2.7.4? Library ------- -- Issue #17531: Return group and user ids as int instead long when possible. +- Issue #17531: Fix tests that thought group and user ids were always the int + type. What's New in Python 2.7.4 release candidate 1 |