traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for catestrophic errors in previous checkin (Argument Clinic rollup patch).

This commit is contained in:
Larry Hastings 2014-01-25 21:30:37 -08:00
parent c20472640c
commit f256c22f34
7 changed files with 1580 additions and 1346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_bz2module.c
View File

@ -56,6 +56,8 @@ typedef struct {
#endif #endif
} BZ2Decompressor; } BZ2Decompressor;
static PyTypeObject BZ2Compressor_Type;
static PyTypeObject BZ2Decompressor_Type;
/* Helper functions. */ /* Helper functions. */
@ -204,7 +206,7 @@ class _bz2.BZ2Decompressor "BZ2Decompressor *" "&BZ2Decompressor_Type"
[clinic start generated code]*/ [clinic start generated code]*/
/*[clinic end generated code: checksum=da39a3ee5e6b4b0d3255bfef95601890afd80709]*/ /*[clinic end generated code: checksum=da39a3ee5e6b4b0d3255bfef95601890afd80709]*/
#include "_bz2module.clinic.c" #include "clinic/_bz2module.c.h"
/*[clinic input] /*[clinic input]
_bz2.BZ2Compressor.compress _bz2.BZ2Compressor.compress

1389
Modules/_lzmamodule.c Normal file
View File

File diff suppressed because it is too large Load Diff

2
Modules/audioop.c
View File

@ -1812,7 +1812,7 @@ audioop_adpcm2lin_impl(PyModuleDef *module, Py_buffer *fragment, int width, PyOb
return rv; return rv;
} }
#include "audioop.clinic.c" #include "clinic/audioop.c.h"
static PyMethodDef audioop_methods[] = { static PyMethodDef audioop_methods[] = {
AUDIOOP_MAX_METHODDEF AUDIOOP_MAX_METHODDEF

2
Modules/binascii.c
View File

@ -236,7 +236,7 @@ ascii_buffer_converter(PyObject *arg, Py_buffer *buf)
return Py_CLEANUP_SUPPORTED; return Py_CLEANUP_SUPPORTED;
} }
#include "binascii.clinic.c" #include "clinic/binascii.c.h"
/*[clinic input] /*[clinic input]
binascii.a2b_uu binascii.a2b_uu

11
Modules/clinic/_bz2module.c.h
View File

@ -75,8 +75,7 @@ _bz2_BZ2Compressor___init__(PyObject *self, PyObject *args, PyObject *kwargs)
int return_value = -1; int return_value = -1;
int compresslevel = 9; int compresslevel = 9;
if (({self_name} == {self_type_object}) && if (!_PyArg_NoKeywords("BZ2Compressor", kwargs))
!_PyArg_NoKeywords("BZ2Compressor", kwargs))
goto exit; goto exit;
if (!PyArg_ParseTuple(args, if (!PyArg_ParseTuple(args,
"|i:BZ2Compressor", "|i:BZ2Compressor",
@ -138,15 +137,13 @@ _bz2_BZ2Decompressor___init__(PyObject *self, PyObject *args, PyObject *kwargs)
{ {
int return_value = -1; int return_value = -1;
if (({self_name} == {self_type_object}) && if (!_PyArg_NoPositional("BZ2Decompressor", args))
!_PyArg_NoPositional("BZ2Decompressor", args))
goto exit; goto exit;
if (({self_name} == {self_type_object}) && if (!_PyArg_NoKeywords("BZ2Decompressor", kwargs))
!_PyArg_NoKeywords("BZ2Decompressor", kwargs))
goto exit; goto exit;
return_value = _bz2_BZ2Decompressor___init___impl((BZ2Decompressor *)self); return_value = _bz2_BZ2Decompressor___init___impl((BZ2Decompressor *)self);
exit: exit:
return return_value; return return_value;
} }
/*[clinic end generated code: checksum=79ee0d9731dfe404baec35b704b2ca2179b9a6c0]*/ /*[clinic end generated code: checksum=9bb33ae7d35494b7a5365f03f390e4b5b8b1bc49]*/

1512
Modules/clinic/_lzmamodule.c.h
View File

File diff suppressed because it is too large Load Diff

6
Tools/clinic/clinic.py
View File

@ -2593,7 +2593,11 @@ class self_converter(CConverter):
def set_template_dict(self, template_dict): def set_template_dict(self, template_dict):
template_dict['self_name'] = self.name template_dict['self_name'] = self.name
template_dict['self_type'] = self.parser_type template_dict['self_type'] = self.parser_type
template_dict['self_type_check'] = '({self_name} == {self_type_object}) &&\n ' if ((self.function.kind == METHOD_NEW) and
self.function.cls and
self.function.cls.typedef):
template_dict['self_type_object'] = self.function.cls.type_object
template_dict['self_type_check'] = '({self_name} == {self_type_object}) &&\n '.format_map(template_dict)