diff -r f1f707dd7cae Modules/_bz2module.c
--- a/Modules/_bz2module.c	Wed Jan 08 16:01:42 2014 +0100
+++ b/Modules/_bz2module.c	Wed Jan 08 23:21:47 2014 +0200
@@ -196,44 +196,117 @@
     return NULL;
 }
 
-PyDoc_STRVAR(BZ2Compressor_compress__doc__,
-"compress(data) -> bytes\n"
+/*[clinic input]
+module bz2
+class bz2.BZ2Compressor
+class bz2.BZ2Decompressor
+[clinic start generated code]*/
+/*[clinic end generated code: checksum=da39a3ee5e6b4b0d3255bfef95601890afd80709]*/
+
+/*[clinic input]
+bz2.BZ2Compressor.compress
+
+    self: self(type="BZ2Compressor *")
+    data: Py_buffer
+    /
+
+Provide data to the compressor object.
+
+Returns a chunk of compressed data if possible, or b'' otherwise.
+
+When you have finished providing data to the compressor, call the
+flush() method to finish the compression process.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(bz2_BZ2Compressor_compress__doc__,
+"compress(data)\n"
+"Provide data to the compressor object.\n"
 "\n"
-"Provide data to the compressor object. Returns a chunk of\n"
-"compressed data if possible, or b'' otherwise.\n"
+"Returns a chunk of compressed data if possible, or b\'\' otherwise.\n"
 "\n"
 "When you have finished providing data to the compressor, call the\n"
-"flush() method to finish the compression process.\n");
+"flush() method to finish the compression process.");
+
+#define BZ2_BZ2COMPRESSOR_COMPRESS_METHODDEF    \
+    {"compress", (PyCFunction)bz2_BZ2Compressor_compress, METH_VARARGS, bz2_BZ2Compressor_compress__doc__},
 
 static PyObject *
-BZ2Compressor_compress(BZ2Compressor *self, PyObject *args)
+bz2_BZ2Compressor_compress_impl(BZ2Compressor *self, Py_buffer *data);
+
+static PyObject *
+bz2_BZ2Compressor_compress(PyObject *self, PyObject *args)
 {
-    Py_buffer buffer;
+    PyObject *return_value = NULL;
+    Py_buffer data = {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL};
+
+    if (!PyArg_ParseTuple(args,
+        "y*:compress",
+        &data))
+        goto exit;
+    return_value = bz2_BZ2Compressor_compress_impl((BZ2Compressor *)self, &data);
+
+exit:
+    /* Cleanup for data */
+    if (data.buf)
+       PyBuffer_Release(&data);
+
+    return return_value;
+}
+
+static PyObject *
+bz2_BZ2Compressor_compress_impl(BZ2Compressor *self, Py_buffer *data)
+/*[clinic end generated code: checksum=3946009df648e4c7b255a87788e66f8fdfbed676]*/
+{
     PyObject *result = NULL;
 
-    if (!PyArg_ParseTuple(args, "y*:compress", &buffer))
-        return NULL;
-
     ACQUIRE_LOCK(self);
     if (self->flushed)
         PyErr_SetString(PyExc_ValueError, "Compressor has been flushed");
     else
-        result = compress(self, buffer.buf, buffer.len, BZ_RUN);
+        result = compress(self, data->buf, data->len, BZ_RUN);
     RELEASE_LOCK(self);
-    PyBuffer_Release(&buffer);
     return result;
 }
 
-PyDoc_STRVAR(BZ2Compressor_flush__doc__,
-"flush() -> bytes\n"
+/*[clinic input]
+bz2.BZ2Compressor.flush
+
+    self: self(type="BZ2Compressor *")
+
+Finish the compression process.
+
+Returns the compressed data left in internal buffers.
+
+The compressor object may not be used after this method is called.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(bz2_BZ2Compressor_flush__doc__,
+"flush()\n"
+"Finish the compression process.\n"
 "\n"
-"Finish the compression process. Returns the compressed data left\n"
-"in internal buffers.\n"
+"Returns the compressed data left in internal buffers.\n"
 "\n"
-"The compressor object may not be used after this method is called.\n");
+"The compressor object may not be used after this method is called.");
+
+#define BZ2_BZ2COMPRESSOR_FLUSH_METHODDEF    \
+    {"flush", (PyCFunction)bz2_BZ2Compressor_flush, METH_NOARGS, bz2_BZ2Compressor_flush__doc__},
 
 static PyObject *
-BZ2Compressor_flush(BZ2Compressor *self, PyObject *noargs)
+bz2_BZ2Compressor_flush_impl(BZ2Compressor *self);
+
+static PyObject *
+bz2_BZ2Compressor_flush(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    PyObject *return_value = NULL;
+
+    return_value = bz2_BZ2Compressor_flush_impl((BZ2Compressor *)self);
+
+    return return_value;
+}
+
+static PyObject *
+bz2_BZ2Compressor_flush_impl(BZ2Compressor *self)
+/*[clinic end generated code: checksum=503dc2a450e09e1910f7ae1e44eb0106ac1bf84f]*/
 {
     PyObject *result = NULL;
 
@@ -325,10 +398,8 @@
 }
 
 static PyMethodDef BZ2Compressor_methods[] = {
-    {"compress",     (PyCFunction)BZ2Compressor_compress, METH_VARARGS,
-     BZ2Compressor_compress__doc__},
-    {"flush",        (PyCFunction)BZ2Compressor_flush,    METH_NOARGS,
-     BZ2Compressor_flush__doc__},
+    BZ2_BZ2COMPRESSOR_COMPRESS_METHODDEF
+    BZ2_BZ2COMPRESSOR_FLUSH_METHODDEF
     {"__getstate__", (PyCFunction)BZ2Compressor_getstate, METH_NOARGS},
     {NULL}
 };
@@ -451,32 +522,70 @@
     return NULL;
 }
 
-PyDoc_STRVAR(BZ2Decompressor_decompress__doc__,
-"decompress(data) -> bytes\n"
+/*[clinic input]
+bz2.BZ2Decompressor.decompress
+
+    self: self(type="BZ2Decompressor *")
+    data: Py_buffer
+    /
+
+Provide data to the decompressor object.
+
+Returns a chunk of decompressed data if possible, or b'' otherwise.
+
+Attempting to decompress data after the end of stream is reached
+raises an EOFError. Any data found after the end of the stream
+is ignored and saved in the unused_data attribute.
+[clinic start generated code]*/
+
+PyDoc_STRVAR(bz2_BZ2Decompressor_decompress__doc__,
+"decompress(data)\n"
+"Provide data to the decompressor object.\n"
 "\n"
-"Provide data to the decompressor object. Returns a chunk of\n"
-"decompressed data if possible, or b'' otherwise.\n"
+"Returns a chunk of decompressed data if possible, or b\'\' otherwise.\n"
 "\n"
 "Attempting to decompress data after the end of stream is reached\n"
 "raises an EOFError. Any data found after the end of the stream\n"
-"is ignored and saved in the unused_data attribute.\n");
+"is ignored and saved in the unused_data attribute.");
+
+#define BZ2_BZ2DECOMPRESSOR_DECOMPRESS_METHODDEF    \
+    {"decompress", (PyCFunction)bz2_BZ2Decompressor_decompress, METH_VARARGS, bz2_BZ2Decompressor_decompress__doc__},
 
 static PyObject *
-BZ2Decompressor_decompress(BZ2Decompressor *self, PyObject *args)
+bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data);
+
+static PyObject *
+bz2_BZ2Decompressor_decompress(PyObject *self, PyObject *args)
 {
-    Py_buffer buffer;
+    PyObject *return_value = NULL;
+    Py_buffer data = {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL};
+
+    if (!PyArg_ParseTuple(args,
+        "y*:decompress",
+        &data))
+        goto exit;
+    return_value = bz2_BZ2Decompressor_decompress_impl((BZ2Decompressor *)self, &data);
+
+exit:
+    /* Cleanup for data */
+    if (data.buf)
+       PyBuffer_Release(&data);
+
+    return return_value;
+}
+
+static PyObject *
+bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data)
+/*[clinic end generated code: checksum=356ef8325b3b734f3ada1c03538e6dd593ba2b5d]*/
+{
     PyObject *result = NULL;
 
-    if (!PyArg_ParseTuple(args, "y*:decompress", &buffer))
-        return NULL;
-
     ACQUIRE_LOCK(self);
     if (self->eof)
         PyErr_SetString(PyExc_EOFError, "End of stream already reached");
     else
-        result = decompress(self, buffer.buf, buffer.len);
+        result = decompress(self, data->buf, data->len);
     RELEASE_LOCK(self);
-    PyBuffer_Release(&buffer);
     return result;
 }
 
@@ -536,8 +645,7 @@
 }
 
 static PyMethodDef BZ2Decompressor_methods[] = {
-    {"decompress", (PyCFunction)BZ2Decompressor_decompress, METH_VARARGS,
-     BZ2Decompressor_decompress__doc__},
+    BZ2_BZ2DECOMPRESSOR_DECOMPRESS_METHODDEF
     {"__getstate__", (PyCFunction)BZ2Decompressor_getstate, METH_NOARGS},
     {NULL}
 };