diff -r 30013dbb5bc2 Modules/grpmodule.c
--- a/Modules/grpmodule.c	Fri Jan 17 12:06:28 2014 -0500
+++ b/Modules/grpmodule.c	Fri Jan 17 14:04:55 2014 -0500
@@ -6,6 +6,11 @@
 
 #include <grp.h>
 
+/*[clinic input]
+module grp
+[clinic start generated code]*/
+/*[clinic end generated code: checksum=da39a3ee5e6b4b0d3255bfef95601890afd80709]*/
+
 static PyStructSequence_Field struct_group_type_fields[] = {
    {"gr_name", "group name"},
    {"gr_passwd", "password"},
@@ -76,14 +81,54 @@
     return v;
 }
 
+/*[clinic input]
+grp.getgrgid
+
+    id: object
+
+Return the group database entry for the given numeric group ID.
+
+If id is not valid, raise KeyError.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(grp_getgrgid__doc__,
+"getgrgid(id)\n"
+"Return the group database entry for the given numeric group ID.\n"
+"\n"
+"If id is not valid, raise KeyError.");
+
+#define GRP_GETGRGID_METHODDEF    \
+    {"getgrgid", (PyCFunction)grp_getgrgid, METH_VARARGS|METH_KEYWORDS, grp_getgrgid__doc__},
+
 static PyObject *
-grp_getgrgid(PyObject *self, PyObject *pyo_id)
+grp_getgrgid_impl(PyModuleDef *module, PyObject *id);
+
+static PyObject *
+grp_getgrgid(PyModuleDef *module, PyObject *args, PyObject *kwargs)
+{
+    PyObject *return_value = NULL;
+    static char *_keywords[] = {"id", NULL};
+    PyObject *id;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+        "O:getgrgid", _keywords,
+        &id))
+        goto exit;
+    return_value = grp_getgrgid_impl(module, id);
+
+exit:
+    return return_value;
+}
+
+static PyObject *
+grp_getgrgid_impl(PyModuleDef *module, PyObject *id)
+/*[clinic end generated code: checksum=6e90fbc6922ac8a6b1a1ddc39287a78c47325fd4]*/
 {
     PyObject *py_int_id;
     gid_t gid;
     struct group *p;
 
-    py_int_id = PyNumber_Long(pyo_id);
+    py_int_id = PyNumber_Long(id);
     if (!py_int_id)
             return NULL;
     if (!_Py_Gid_Converter(py_int_id, &gid)) {
@@ -103,22 +148,60 @@
     return mkgrent(p);
 }
 
+/*[clinic input]
+grp.getgrnam
+
+    name: unicode
+
+Return the group database entry for the given group name.
+
+If name is not valid, raise KeyError.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(grp_getgrnam__doc__,
+"getgrnam(name)\n"
+"Return the group database entry for the given group name.\n"
+"\n"
+"If name is not valid, raise KeyError.");
+
+#define GRP_GETGRNAM_METHODDEF    \
+    {"getgrnam", (PyCFunction)grp_getgrnam, METH_VARARGS|METH_KEYWORDS, grp_getgrnam__doc__},
+
 static PyObject *
-grp_getgrnam(PyObject *self, PyObject *args)
+grp_getgrnam_impl(PyModuleDef *module, PyObject *name);
+
+static PyObject *
+grp_getgrnam(PyModuleDef *module, PyObject *args, PyObject *kwargs)
 {
-    char *name;
+    PyObject *return_value = NULL;
+    static char *_keywords[] = {"name", NULL};
+    PyObject *name;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+        "U:getgrnam", _keywords,
+        &name))
+        goto exit;
+    return_value = grp_getgrnam_impl(module, name);
+
+exit:
+    return return_value;
+}
+
+static PyObject *
+grp_getgrnam_impl(PyModuleDef *module, PyObject *name)
+/*[clinic end generated code: checksum=371e8d158be46aa5d095e6eb19bcc975124b622f]*/
+{
+    char *name_chars;
     struct group *p;
-    PyObject *arg, *bytes, *retval = NULL;
+    PyObject *bytes, *retval = NULL;
 
-    if (!PyArg_ParseTuple(args, "U:getgrnam", &arg))
+    if ((bytes = PyUnicode_EncodeFSDefault(name)) == NULL)
         return NULL;
-    if ((bytes = PyUnicode_EncodeFSDefault(arg)) == NULL)
-        return NULL;
-    if (PyBytes_AsStringAndSize(bytes, &name, NULL) == -1)
+    if (PyBytes_AsStringAndSize(bytes, &name_chars, NULL) == -1)
         goto out;
 
-    if ((p = getgrnam(name)) == NULL) {
-        PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %s", name);
+    if ((p = getgrnam(name_chars)) == NULL) {
+        PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %s", name_chars);
         goto out;
     }
     retval = mkgrent(p);
@@ -127,8 +210,41 @@
     return retval;
 }
 
+/*[clinic input]
+grp.getgrall
+
+Return a list of all available group entries, in arbitrary order.
+
+An entry whose name starts with '+' or '-' represents an instruction
+to use YP/NIS and may not be accessible via getgrnam or getgrgid.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(grp_getgrall__doc__,
+"getgrall()\n"
+"Return a list of all available group entries, in arbitrary order.\n"
+"\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.");
+
+#define GRP_GETGRALL_METHODDEF    \
+    {"getgrall", (PyCFunction)grp_getgrall, METH_NOARGS, grp_getgrall__doc__},
+
 static PyObject *
-grp_getgrall(PyObject *self, PyObject *ignore)
+grp_getgrall_impl(PyModuleDef *module);
+
+static PyObject *
+grp_getgrall(PyModuleDef *module, PyObject *Py_UNUSED(ignored))
+{
+    PyObject *return_value = NULL;
+
+    return_value = grp_getgrall_impl(module);
+
+    return return_value;
+}
+
+static PyObject *
+grp_getgrall_impl(PyModuleDef *module)
+/*[clinic end generated code: checksum=d525b6b8bd930c1aa07d21f7632b0f644cf19d2f]*/
 {
     PyObject *d;
     struct group *p;
@@ -151,20 +267,10 @@
 }
 
 static PyMethodDef grp_methods[] = {
-    {"getgrgid",        grp_getgrgid,   METH_O,
-     "getgrgid(id) -> tuple\n\
-Return the group database entry for the given numeric group ID.  If\n\
-id is not valid, raise KeyError."},
-    {"getgrnam",        grp_getgrnam,   METH_VARARGS,
-     "getgrnam(name) -> tuple\n\
-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.\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 */
+    GRP_GETGRGID_METHODDEF
+    GRP_GETGRNAM_METHODDEF
+    GRP_GETGRALL_METHODDEF
+    {NULL, NULL}
 };
 
 PyDoc_STRVAR(grp__doc__,