mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-15 21:04:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge 2.7.4 release branch

Browse Source
This commit is contained in:
Benjamin Peterson 2013-03-23 15:40:48 -05:00
commit 4a03c7d482
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_grp.py
View File

@ -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)

4
Lib/test/test_pwd.py
View File

@ -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)

3
Misc/NEWS
View File

@ -21,7 +21,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