Merged revisions 87238 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87238 | r.david.murray | 2010-12-14 11:20:53 -0500 (Tue, 14 Dec 2010) | 7 lines

  #775964: skip YP/NIS entries instead of failing the test

  Also includes doc updates mentioning that these entries may not
  be retrievable via getgrnam and getgrgid.

  Patch by Bobby Impollonia.
........

diff --git a/Doc/library/grp.rst b/Doc/library/grp.rst
index 57f160a96f3d27f67b6c6aec853fd7e87d54fbcf..88821406a33d690ae774321fcc920e9754208f99 100644 (file)
--- a/Doc/library/grp.rst
+++ b/Doc/library/grp.rst
@@ -30,7 +30,9 @@ correspond to the members of the ``group`` structure (Attribute field below, see
 The gid is an integer, name and password are strings, and the member list is a
 list of strings. (Note that most users are not explicitly listed as members of
 the group they are in according to the password database.  Check both databases
-to get complete membership information.)
+to get complete membership information.  Also note that a ``gr_name`` that
+starts with a ``+`` or ``-`` is likely to be a YP/NIS reference and may not be
+accessible via :func:`getgrnam` or :func:`getgrgid`.)
 
 It defines the following items:
 

diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py
index 765b4b68f5f2e98696901662a6d00c386b7e8446..8acc97c638a06661c38a0e0d198c510ee18bf856 100755 (executable)
--- a/Lib/test/test_grp.py
+++ b/Lib/test/test_grp.py
@@ -33,12 +33,16 @@ class GroupDatabaseTestCase(unittest.TestCase):
             e2 = grp.getgrgid(e.gr_gid)
             self.check_value(e2)
             self.assertEqual(e2.gr_gid, e.gr_gid)
-            e2 = grp.getgrnam(e.gr_name)
+            name = e.gr_name
+            if name.startswith('+') or name.startswith('-'):
+                # NIS-related entry
+                continue
+            e2 = grp.getgrnam(name)
             self.check_value(e2)
             # There are instances where getgrall() returns group names in
             # lowercase while getgrgid() returns proper casing.
             # Discovered on Ubuntu 5.04 (custom).
-            self.assertEqual(e2.gr_name.lower(), e.gr_name.lower())
+            self.assertEqual(e2.gr_name.lower(), name.lower())
 
     def test_errors(self):
         self.assertRaises(TypeError, grp.getgrgid)

diff --git a/Misc/ACKS b/Misc/ACKS
index 1108f9020e4fc06dac6d85c7268f993d7775b040..83527151c1403276fb58eae558a8019f71f5c4c2 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -369,6 +369,7 @@ Gerhard Häring
 Fredrik Håård
 Mihai Ibanescu
 Lars Immisch
+Bobby Impollonia
 Meador Inge
 Tony Ingraldi
 John Interrante

diff --git a/Misc/NEWS b/Misc/NEWS
index 058b02a6971a4e07d76d09bb71daf70c1196dc9f..6b6dcba60ab62f02355f0b2a8353e79b8778fbe8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,6 +47,9 @@ Extensions
 Tests
 -----
 
+- Issue #775964: test_grp now skips YP/NIS entries instead of failing when
+  encountering them.
+
 - Issue #7110: regrtest now sends test failure reports and single-failure
   tracebacks to stderr rather than stdout.
 

diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
index ca3a3583f81742bfb02b99bf8bd66d5ce868f011..4ab5547fddbc19352b52817871cedc1cec4b8e02 100644 (file)
--- a/Modules/grpmodule.c
+++ b/Modules/grpmodule.c
@@ -164,7 +164,9 @@ Return the group database entry for the given group name.  If\n\
 name is not valid, raise KeyError."},
     {"getgrall",        grp_getgrall,   METH_NOARGS,
      "getgrall() -> list of tuples\n\
-Return a list of all available group entries, in arbitrary order."},
+Return a list of all available group entries, in arbitrary order.\n\
+An entry whose name starts with '+' or '-' represents an instruction\n\
+to use YP/NIS and may not be accessible via getgrnam or getgrgid."},
     {NULL,              NULL}           /* sentinel */
 };