diff -r 73c01323cb9b Modules/_codecsmodule.c
--- a/Modules/_codecsmodule.c	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/_codecsmodule.c	Tue May 12 13:46:48 2015 +0300
@@ -290,14 +290,14 @@ static PyObject *
 _codecs.utf_7_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_7_decode_impl(PyModuleDef *module, Py_buffer *data,
                           const char *errors, int final)
-/*[clinic end generated code: output=ca945e907e72e827 input=bc4d6247ecdb01e6]*/
+/*[clinic end generated code: output=ca945e907e72e827 input=18b6fa0f627704e5]*/
 {
     Py_ssize_t consumed = data->len;
     PyObject *decoded = PyUnicode_DecodeUTF7Stateful(data->buf, data->len,
@@ -310,14 +310,14 @@ static PyObject *
 _codecs.utf_8_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_8_decode_impl(PyModuleDef *module, Py_buffer *data,
                           const char *errors, int final)
-/*[clinic end generated code: output=7309f9ff4ef5c9b6 input=39161d71e7422ee2]*/
+/*[clinic end generated code: output=7309f9ff4ef5c9b6 input=5a05ae6c14936f08]*/
 {
     Py_ssize_t consumed = data->len;
     PyObject *decoded = PyUnicode_DecodeUTF8Stateful(data->buf, data->len,
@@ -330,14 +330,14 @@ static PyObject *
 _codecs.utf_16_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_16_decode_impl(PyModuleDef *module, Py_buffer *data,
                            const char *errors, int final)
-/*[clinic end generated code: output=8d2fa0507d9bef2c input=f3cf01d1461007ce]*/
+/*[clinic end generated code: output=8d2fa0507d9bef2c input=8037c9827310d652]*/
 {
     int byteorder = 0;
     /* This is overwritten unless final is true. */
@@ -352,14 +352,14 @@ static PyObject *
 _codecs.utf_16_le_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_16_le_decode_impl(PyModuleDef *module, Py_buffer *data,
                               const char *errors, int final)
-/*[clinic end generated code: output=4fd621515ef4ce18 input=a77e3bf97335d94e]*/
+/*[clinic end generated code: output=4fd621515ef4ce18 input=967cd5f7dc9e5eed]*/
 {
     int byteorder = -1;
     /* This is overwritten unless final is true. */
@@ -374,14 +374,14 @@ static PyObject *
 _codecs.utf_16_be_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_16_be_decode_impl(PyModuleDef *module, Py_buffer *data,
                               const char *errors, int final)
-/*[clinic end generated code: output=792f4eacb3e1fa05 input=606f69fae91b5563]*/
+/*[clinic end generated code: output=792f4eacb3e1fa05 input=ca1af94c5487779d]*/
 {
     int byteorder = 1;
     /* This is overwritten unless final is true. */
@@ -404,14 +404,14 @@ static PyObject *
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
     byteorder: int = 0
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_16_ex_decode_impl(PyModuleDef *module, Py_buffer *data,
                               const char *errors, int byteorder, int final)
-/*[clinic end generated code: output=f136a186dc2defa0 input=f6e7f697658c013e]*/
+/*[clinic end generated code: output=f136a186dc2defa0 input=7026b8f0da831614]*/
 {
     /* This is overwritten unless final is true. */
     Py_ssize_t consumed = data->len;
@@ -428,14 +428,14 @@ static PyObject *
 _codecs.utf_32_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_32_decode_impl(PyModuleDef *module, Py_buffer *data,
                            const char *errors, int final)
-/*[clinic end generated code: output=b7635e55857e8efb input=86d4f41c6c2e763d]*/
+/*[clinic end generated code: output=b7635e55857e8efb input=617ee263b6950ca4]*/
 {
     int byteorder = 0;
     /* This is overwritten unless final is true. */
@@ -450,14 +450,14 @@ static PyObject *
 _codecs.utf_32_le_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_32_le_decode_impl(PyModuleDef *module, Py_buffer *data,
                               const char *errors, int final)
-/*[clinic end generated code: output=a79d1787d8ddf988 input=d18b650772d188ba]*/
+/*[clinic end generated code: output=a79d1787d8ddf988 input=3e339ce39bf6cff0]*/
 {
     int byteorder = -1;
     /* This is overwritten unless final is true. */
@@ -472,14 +472,14 @@ static PyObject *
 _codecs.utf_32_be_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_32_be_decode_impl(PyModuleDef *module, Py_buffer *data,
                               const char *errors, int final)
-/*[clinic end generated code: output=a8356b0f36779981 input=19c271b5d34926d8]*/
+/*[clinic end generated code: output=a8356b0f36779981 input=2ce361c361a051d7]*/
 {
     int byteorder = 1;
     /* This is overwritten unless final is true. */
@@ -502,14 +502,14 @@ static PyObject *
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
     byteorder: int = 0
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_utf_32_ex_decode_impl(PyModuleDef *module, Py_buffer *data,
                               const char *errors, int byteorder, int final)
-/*[clinic end generated code: output=ab8c70977c1992f5 input=4af3e6ccfe34a076]*/
+/*[clinic end generated code: output=ab8c70977c1992f5 input=faf67fa63968f6a4]*/
 {
     Py_ssize_t consumed = data->len;
     PyObject *decoded = PyUnicode_DecodeUTF32Stateful(data->buf, data->len,
@@ -614,14 +614,14 @@ static PyObject *
 _codecs.mbcs_decode
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_mbcs_decode_impl(PyModuleDef *module, Py_buffer *data,
                          const char *errors, int final)
-/*[clinic end generated code: output=0ebaf3a5b20e53fa input=d492c1ca64f4fa8a]*/
+/*[clinic end generated code: output=0ebaf3a5b20e53fa input=723e8902ff0f9ec6]*/
 {
     Py_ssize_t consumed = data->len;
     PyObject *decoded = PyUnicode_DecodeMBCSStateful(data->buf, data->len,
@@ -634,14 +634,14 @@ static PyObject *
     codepage: int
     data: Py_buffer
     errors: str(accept={str, NoneType}) = NULL
-    final: int(c_default="0") = False
+    final: boolint = False
     /
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_code_page_decode_impl(PyModuleDef *module, int codepage,
                               Py_buffer *data, const char *errors, int final)
-/*[clinic end generated code: output=4318e3d9971e31ba input=4f3152a304e21d51]*/
+/*[clinic end generated code: output=4318e3d9971e31ba input=56805e4d40e13b26]*/
 {
     Py_ssize_t consumed = data->len;
     PyObject *decoded = PyUnicode_DecodeCodePageStateful(code_page,
diff -r 73c01323cb9b Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/_io/_iomodule.c	Tue May 12 13:46:48 2015 +0300
@@ -103,7 +103,7 @@ module _io
     encoding: str(accept={str, NoneType}) = NULL
     errors: str(accept={str, NoneType}) = NULL
     newline: str(accept={str, NoneType}) = NULL
-    closefd: int(c_default="1") = True
+    closefd: boolint = True
     opener: object = None
 
 Open file and return a stream.  Raise IOError upon failure.
@@ -230,7 +230,7 @@ static PyObject *
 _io_open_impl(PyModuleDef *module, PyObject *file, const char *mode,
               int buffering, const char *encoding, const char *errors,
               const char *newline, int closefd, PyObject *opener)
-/*[clinic end generated code: output=7615d0d746eb14d2 input=f4e1ca75223987bc]*/
+/*[clinic end generated code: output=7615d0d746eb14d2 input=58204e5196b48923]*/
 {
     unsigned i;
 
diff -r 73c01323cb9b Modules/_io/fileio.c
--- a/Modules/_io/fileio.c	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/_io/fileio.c	Tue May 12 13:46:48 2015 +0300
@@ -210,7 +210,7 @@ extern int _Py_open_cloexec_works;
 _io.FileIO.__init__
     file as nameobj: object
     mode: str = "r"
-    closefd: int(c_default="1") = True
+    closefd: boolint = True
     opener: object = None
 
 Open a file.
@@ -231,7 +231,7 @@ results in functionality similar to pass
 static int
 _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode,
                          int closefd, PyObject *opener)
-/*[clinic end generated code: output=23413f68e6484bbd input=193164e293d6c097]*/
+/*[clinic end generated code: output=23413f68e6484bbd input=acc8e5585e47f711]*/
 {
     const char *name = NULL;
     PyObject *stringobj = NULL;
diff -r 73c01323cb9b Modules/_io/textio.c
--- a/Modules/_io/textio.c	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/_io/textio.c	Tue May 12 13:46:48 2015 +0300
@@ -511,13 +511,13 @@ PyObject *
 /*[clinic input]
 _io.IncrementalNewlineDecoder.decode
     input: object
-    final: int(c_default="0") = False
+    final: boolint = False
 [clinic start generated code]*/
 
 static PyObject *
 _io_IncrementalNewlineDecoder_decode_impl(nldecoder_object *self,
                                           PyObject *input, int final)
-/*[clinic end generated code: output=0d486755bb37a66e input=d65677385bfd6827]*/
+/*[clinic end generated code: output=0d486755bb37a66e input=f7593e0bfe3f05eb]*/
 {
     return _PyIncrementalNewlineDecoder_decode((PyObject *) self, input, final);
 }
@@ -792,8 +792,8 @@ static encodefuncentry encodefuncs[] = {
     encoding: str(accept={str, NoneType}) = NULL
     errors: str(accept={str, NoneType}) = NULL
     newline: str(accept={str, NoneType}) = NULL
-    line_buffering: int(c_default="0") = False
-    write_through: int(c_default="0") = False
+    line_buffering: boolint = False
+    write_through: boolint = False
 
 Character and line based layer over a BufferedIOBase object, buffer.
 
@@ -830,7 +830,7 @@ static int
                                 const char *encoding, const char *errors,
                                 const char *newline, int line_buffering,
                                 int write_through)
-/*[clinic end generated code: output=56a83402ce2a8381 input=3126cb3101a2c99b]*/
+/*[clinic end generated code: output=56a83402ce2a8381 input=1b3a28856f343a16]*/
 {
     PyObject *raw, *codec_info = NULL;
     _PyIO_State *state = NULL;
diff -r 73c01323cb9b Modules/_tkinter.c
--- a/Modules/_tkinter.c	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/_tkinter.c	Tue May 12 13:46:48 2015 +0300
@@ -3122,11 +3122,11 @@ static PyObject *
     screenName: str(accept={str, NoneType}) = NULL
     baseName: str = NULL
     className: str = "Tk"
-    interactive: int(c_default="0") = False
-    wantobjects: int(c_default="0") = False
-    wantTk: int(c_default="1") = True
+    interactive: boolint = False
+    wantobjects: boolint = False
+    wantTk: boolint = True
         if false, then Tk_Init() doesn't get called
-    sync: int(c_default="0") = False
+    sync: boolint = False
         if true, then pass -sync to wish
     use: str(accept={str, NoneType}) = NULL
         if not None, then pass -use to wish
@@ -3139,7 +3139,7 @@ static PyObject *
                      const char *baseName, const char *className,
                      int interactive, int wantobjects, int wantTk, int sync,
                      const char *use)
-/*[clinic end generated code: output=b8847800fc3b27eb input=0d522aad1cb0ca0e]*/
+/*[clinic end generated code: output=b8847800fc3b27eb input=8fa2b124ccc8173e]*/
 {
     /* XXX baseName is not used anymore;
      * try getting rid of it. */
diff -r 73c01323cb9b Modules/binascii.c
--- a/Modules/binascii.c	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/binascii.c	Tue May 12 13:46:48 2015 +0300
@@ -1244,14 +1244,14 @@ static int table_hex[128] = {
 binascii.a2b_qp
 
     data: ascii_buffer
-    header: int(c_default="0") = False
+    header: boolint = False
 
 Decode a string of qp-encoded data.
 [clinic start generated code]*/
 
 static PyObject *
 binascii_a2b_qp_impl(PyModuleDef *module, Py_buffer *data, int header)
-/*[clinic end generated code: output=a44ef88270352114 input=5187a0d3d8e54f3b]*/
+/*[clinic end generated code: output=a44ef88270352114 input=7c5ffa7ea2785118]*/
 {
     Py_ssize_t in, out;
     char ch;
@@ -1344,9 +1344,9 @@ to_hex (unsigned char ch, unsigned char 
 binascii.b2a_qp
 
     data: Py_buffer
-    quotetabs: int(c_default="0") = False
-    istext: int(c_default="1") = True
-    header: int(c_default="0") = False
+    quotetabs: boolint = False
+    istext: boolint = True
+    header: boolint = False
 
 Encode a string using quoted-printable encoding.
 
@@ -1358,7 +1358,7 @@ are both encoded.  When quotetabs is set
 static PyObject *
 binascii_b2a_qp_impl(PyModuleDef *module, Py_buffer *data, int quotetabs,
                      int istext, int header)
-/*[clinic end generated code: output=a87ca9ccb94e2a9f input=7f2a9aaa008e92b2]*/
+/*[clinic end generated code: output=a87ca9ccb94e2a9f input=32ac7d9bd11261e5]*/
 {
     Py_ssize_t in, out;
     unsigned char *databuf, *odata;
diff -r 73c01323cb9b Modules/cjkcodecs/clinic/multibytecodec.c.h
--- a/Modules/cjkcodecs/clinic/multibytecodec.c.h	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h	Tue May 12 13:46:48 2015 +0300
@@ -79,7 +79,7 @@ exit:
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalEncoder_encode__doc__,
-"encode($self, /, input, final=0)\n"
+"encode($self, /, input, final=False)\n"
 "--\n"
 "\n");
 
@@ -126,7 +126,7 @@ static PyObject *
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_decode__doc__,
-"decode($self, /, input, final=0)\n"
+"decode($self, /, input, final=False)\n"
 "--\n"
 "\n");
 
@@ -317,4 +317,4 @@ PyDoc_STRVAR(_multibytecodec___create_co
 
 #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF    \
     {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__},
-/*[clinic end generated code: output=c104f5fd548c1ac5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=eebb21e18c3043d1 input=a9049054013a1b77]*/
diff -r 73c01323cb9b Modules/cjkcodecs/multibytecodec.c
--- a/Modules/cjkcodecs/multibytecodec.c	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/cjkcodecs/multibytecodec.c	Tue May 12 13:46:48 2015 +0300
@@ -884,14 +884,14 @@ decoder_feed_buffer(MultibyteStatefulDec
 _multibytecodec.MultibyteIncrementalEncoder.encode
 
     input: object
-    final: int = 0
+    final: boolint = False
 [clinic start generated code]*/
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self,
                                                         PyObject *input,
                                                         int final)
-/*[clinic end generated code: output=123361b6c505e2c1 input=456b76d73e464661]*/
+/*[clinic end generated code: output=123361b6c505e2c1 input=05077368bbf2fb25]*/
 {
     return encoder_encode_stateful(STATEFUL_ECTX(self), input, final);
 }
@@ -1041,14 +1041,14 @@ static PyTypeObject MultibyteIncremental
 _multibytecodec.MultibyteIncrementalDecoder.decode
 
     input: Py_buffer
-    final: int = 0
+    final: boolint = False
 [clinic start generated code]*/
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self,
                                                         Py_buffer *input,
                                                         int final)
-/*[clinic end generated code: output=b9b9090e8a9ce2ba input=eb18c2f6e83589e1]*/
+/*[clinic end generated code: output=b9b9090e8a9ce2ba input=b54606b32ce917b1]*/
 {
     MultibyteDecodeBuffer buf;
     char *data, *wdata = NULL;
diff -r 73c01323cb9b Modules/clinic/pyexpat.c.h
--- a/Modules/clinic/pyexpat.c.h	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/clinic/pyexpat.c.h	Tue May 12 13:46:48 2015 +0300
@@ -3,7 +3,7 @@ preserve
 [clinic start generated code]*/
 
 PyDoc_STRVAR(pyexpat_xmlparser_Parse__doc__,
-"Parse($self, data, isFinal=0, /)\n"
+"Parse($self, data, isFinal=False, /)\n"
 "--\n"
 "\n"
 "Parse XML data.\n"
@@ -281,4 +281,4 @@ exit:
 #ifndef PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
     #define PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
 #endif /* !defined(PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF) */
-/*[clinic end generated code: output=958c0faa1b855fc7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=46ea35596748baf0 input=a9049054013a1b77]*/
diff -r 73c01323cb9b Modules/pyexpat.c
--- a/Modules/pyexpat.c	Tue May 12 13:35:48 2015 +0300
+++ b/Modules/pyexpat.c	Tue May 12 13:46:48 2015 +0300
@@ -707,7 +707,7 @@ get_parse_result(xmlparseobject *self, i
 pyexpat.xmlparser.Parse
 
     data: object
-    isFinal: int = 0
+    isFinal: boolint = False
     /
 
 Parse XML data.
@@ -718,7 +718,7 @@ Parse XML data.
 static PyObject *
 pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyObject *data,
                              int isFinal)
-/*[clinic end generated code: output=37e105d55645b0f2 input=e37b81b8948ca7e0]*/
+/*[clinic end generated code: output=37e105d55645b0f2 input=5ca4991e1906b1e5]*/
 {
     const char *s;
     Py_ssize_t slen;
diff -r 73c01323cb9b Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c	Tue May 12 13:35:48 2015 +0300
+++ b/Objects/bytearrayobject.c	Tue May 12 13:46:48 2015 +0300
@@ -2777,7 +2777,7 @@ bytearray_join(PyByteArrayObject *self, 
 /*[clinic input]
 bytearray.splitlines
 
-    keepends: int(py_default="False") = 0
+    keepends: boolint = False
 
 Return a list of the lines in the bytearray, breaking at line boundaries.
 
@@ -2787,7 +2787,7 @@ true.
 
 static PyObject *
 bytearray_splitlines_impl(PyByteArrayObject *self, int keepends)
-/*[clinic end generated code: output=4223c94b895f6ad9 input=36f0b25bc792f6c0]*/
+/*[clinic end generated code: output=4223c94b895f6ad9 input=efb9dc3c3f1ded38]*/
 {
     return stringlib_splitlines(
         (PyObject*) self, PyByteArray_AS_STRING(self),
diff -r 73c01323cb9b Objects/bytesobject.c
--- a/Objects/bytesobject.c	Tue May 12 13:35:48 2015 +0300
+++ b/Objects/bytesobject.c	Tue May 12 13:46:48 2015 +0300
@@ -2942,7 +2942,7 @@ bytes_decode_impl(PyBytesObject*self, co
 /*[clinic input]
 bytes.splitlines
 
-    keepends: int(py_default="False") = 0
+    keepends: boolint = False
 
 Return a list of the lines in the bytes, breaking at line boundaries.
 
@@ -2952,7 +2952,7 @@ true.
 
 static PyObject *
 bytes_splitlines_impl(PyBytesObject*self, int keepends)
-/*[clinic end generated code: output=995c3598f7833cad input=ddb93e3351080c8c]*/
+/*[clinic end generated code: output=995c3598f7833cad input=a47c5dd5417e45fc]*/
 {
     return stringlib_splitlines(
         (PyObject*) self, PyBytes_AS_STRING(self),
diff -r 73c01323cb9b Tools/clinic/clinic.py
--- a/Tools/clinic/clinic.py	Tue May 12 13:35:48 2015 +0300
+++ b/Tools/clinic/clinic.py	Tue May 12 13:46:48 2015 +0300
@@ -2545,6 +2545,9 @@ class int_converter(CConverter):
         if type != None:
             self.type = type
 
+class boolint_converter(bool_converter):
+    format_unit = 'i'
+
 class unsigned_int_converter(CConverter):
     type = 'unsigned int'
     default_type = int