diff -r 89b738e3d0c9 Modules/sha256module.c
--- a/Modules/sha256module.c	Thu Jan 23 09:49:42 2014 +0200
+++ b/Modules/sha256module.c	Thu Jan 23 17:20:58 2014 +0800
@@ -20,6 +20,11 @@
 #include "structmember.h"
 #include "hashlib.h"
 
+/*[clinic input]
+module _sha256
+class SHA256Type
+[clinic start generated code]*/
+/*[clinic end generated code: checksum=da39a3ee5e6b4b0d3255bfef95601890afd80709]*/
 
 /* Some useful types */
 
@@ -462,18 +467,28 @@
     return retval;
 }
 
-PyDoc_STRVAR(SHA256_update__doc__,
-"Update this hash object's state with the provided string.");
+/*[clinic input]
+SHA256Type.update
+    self: self(type="SHAobject *")
+    obj: object
+    /
+
+Update this hash object's state with the provided string.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(SHA256Type_update__doc__,
+"update(obj)\n"
+"Update this hash object\'s state with the provided string.");
+
+#define SHA256TYPE_UPDATE_METHODDEF    \
+    {"update", (PyCFunction)SHA256Type_update, METH_O, SHA256Type_update__doc__},
 
 static PyObject *
-SHA256_update(SHAobject *self, PyObject *args)
+SHA256Type_update(SHAobject *self, PyObject *obj)
+/*[clinic end generated code: checksum=3e9b453c3b9532161d3a7619c009639e04d2ed00]*/
 {
-    PyObject *obj;
     Py_buffer buf;
 
-    if (!PyArg_ParseTuple(args, "O:update", &obj))
-        return NULL;
-
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
 
     sha_update(self, buf.buf, buf.len);
@@ -487,7 +502,7 @@
     {"copy",      (PyCFunction)SHA256_copy,      METH_NOARGS,  SHA256_copy__doc__},
     {"digest",    (PyCFunction)SHA256_digest,    METH_NOARGS,  SHA256_digest__doc__},
     {"hexdigest", (PyCFunction)SHA256_hexdigest, METH_NOARGS,  SHA256_hexdigest__doc__},
-    {"update",    (PyCFunction)SHA256_update,    METH_VARARGS, SHA256_update__doc__},
+    SHA256TYPE_UPDATE_METHODDEF
     {NULL,        NULL}         /* sentinel */
 };
 
@@ -594,27 +609,53 @@
 
 /* The single module-level function: new() */
 
-PyDoc_STRVAR(SHA256_new__doc__,
+/*[clinic input]
+_sha256.sha256
+
+    string: object = NULL
+
+Return a new SHA-256 hash object; optionally initialized with a string.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(_sha256_sha256__doc__,
+"sha256(string=None)\n"
 "Return a new SHA-256 hash object; optionally initialized with a string.");
 
+#define _SHA256_SHA256_METHODDEF    \
+    {"sha256", (PyCFunction)_sha256_sha256, METH_VARARGS|METH_KEYWORDS, _sha256_sha256__doc__},
+
 static PyObject *
-SHA256_new(PyObject *self, PyObject *args, PyObject *kwdict)
+_sha256_sha256_impl(PyModuleDef *module, PyObject *string);
+
+static PyObject *
+_sha256_sha256(PyModuleDef *module, PyObject *args, PyObject *kwargs)
 {
-    static char *kwlist[] = {"string", NULL};
+    PyObject *return_value = NULL;
+    static char *_keywords[] = {"string", NULL};
+    PyObject *string = NULL;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+        "|O:sha256", _keywords,
+        &string))
+        goto exit;
+    return_value = _sha256_sha256_impl(module, string);
+
+exit:
+    return return_value;
+}
+
+static PyObject *
+_sha256_sha256_impl(PyModuleDef *module, PyObject *string)
+/*[clinic end generated code: checksum=57489d297b62587b3863c9ffc7b44c414c5bea6c]*/
+{
     SHAobject *new;
-    PyObject *data_obj = NULL;
     Py_buffer buf;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|O:new", kwlist,
-                                     &data_obj)) {
-        return NULL;
-    }
-
-    if (data_obj)
-        GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf);
+    if (string)
+        GET_BUFFER_VIEW_OR_ERROUT(string, &buf);
 
     if ((new = newSHA256object()) == NULL) {
-        if (data_obj)
+        if (string)
             PyBuffer_Release(&buf);
         return NULL;
     }
@@ -623,11 +664,11 @@
 
     if (PyErr_Occurred()) {
         Py_DECREF(new);
-        if (data_obj)
+        if (string)
             PyBuffer_Release(&buf);
         return NULL;
     }
-    if (data_obj) {
+    if (string) {
         sha_update(new, buf.buf, buf.len);
         PyBuffer_Release(&buf);
     }
@@ -635,27 +676,53 @@
     return (PyObject *)new;
 }
 
-PyDoc_STRVAR(SHA224_new__doc__,
+/*[clinic input]
+_sha256.sha224
+
+    string: object = NULL
+
+Return a new SHA-224 hash object; optionally initialized with a string.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(_sha256_sha224__doc__,
+"sha224(string=None)\n"
 "Return a new SHA-224 hash object; optionally initialized with a string.");
 
+#define _SHA256_SHA224_METHODDEF    \
+    {"sha224", (PyCFunction)_sha256_sha224, METH_VARARGS|METH_KEYWORDS, _sha256_sha224__doc__},
+
 static PyObject *
-SHA224_new(PyObject *self, PyObject *args, PyObject *kwdict)
+_sha256_sha224_impl(PyModuleDef *module, PyObject *string);
+
+static PyObject *
+_sha256_sha224(PyModuleDef *module, PyObject *args, PyObject *kwargs)
 {
-    static char *kwlist[] = {"string", NULL};
+    PyObject *return_value = NULL;
+    static char *_keywords[] = {"string", NULL};
+    PyObject *string = NULL;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+        "|O:sha224", _keywords,
+        &string))
+        goto exit;
+    return_value = _sha256_sha224_impl(module, string);
+
+exit:
+    return return_value;
+}
+
+static PyObject *
+_sha256_sha224_impl(PyModuleDef *module, PyObject *string)
+/*[clinic end generated code: checksum=dd57bf8e55b00db4f1577f73211643d4c6a8edba]*/
+{
     SHAobject *new;
-    PyObject *data_obj = NULL;
     Py_buffer buf;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|O:new", kwlist,
-                                     &data_obj)) {
-        return NULL;
-    }
-
-    if (data_obj)
-        GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf);
+    if (string)
+        GET_BUFFER_VIEW_OR_ERROUT(string, &buf);
 
     if ((new = newSHA224object()) == NULL) {
-        if (data_obj)
+        if (string)
             PyBuffer_Release(&buf);
         return NULL;
     }
@@ -664,11 +731,11 @@
 
     if (PyErr_Occurred()) {
         Py_DECREF(new);
-        if (data_obj)
+        if (string)
             PyBuffer_Release(&buf);
         return NULL;
     }
-    if (data_obj) {
+    if (string) {
         sha_update(new, buf.buf, buf.len);
         PyBuffer_Release(&buf);
     }
@@ -680,8 +747,8 @@
 /* List of functions exported by this module */
 
 static struct PyMethodDef SHA_functions[] = {
-    {"sha256", (PyCFunction)SHA256_new, METH_VARARGS|METH_KEYWORDS, SHA256_new__doc__},
-    {"sha224", (PyCFunction)SHA224_new, METH_VARARGS|METH_KEYWORDS, SHA224_new__doc__},
+    _SHA256_SHA256_METHODDEF
+    _SHA256_SHA224_METHODDEF
     {NULL,      NULL}            /* Sentinel */
 };