[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.4 release branch

[benjamin.peterson]

http://hg.python.org/cpython/rev/9a798f2ee1c5
changeset:   82926:9a798f2ee1c5
branch:      2.7
parent:      82924:f99c8187f08d
parent:      82925:c982393bea4e
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Mar 23 15:40:48 2013 -0500
summary:
  merge 2.7.4 release branch

files:
  Lib/test/test_grp.py |  2 +-
  Lib/test/test_pwd.py |  4 ++--
  Misc/NEWS            |  3 ++-
  3 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py
--- a/Lib/test/test_grp.py
+++ b/Lib/test/test_grp.py
@@ -16,7 +16,7 @@
         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
--- a/Lib/test/test_pwd.py
+++ b/Lib/test/test_pwd.py
@@ -18,9 +18,9 @@
             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)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,7 +21,8 @@
 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

-- 
Repository URL: http://hg.python.org/cpython