Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 09fcb72

Browse files
pitroupitrou
committed
Issue #19356: Avoid using a C variabled named "_self", it's a reserved word in some C compilers.
1 parent d5d0bc3 commit 09fcb72

5 files changed

Lines changed: 53 additions & 50 deletions

File tree

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,9 @@ Tools/Demos
568568
Build
569569
-----
570570

571+
- Issue #19356: Avoid using a C variabled named "_self", it's a reserved
572+
word in some C compilers.
573+
571574
- Issue #19130: Correct PCbuild/readme.txt, Python 3.3 and 3.4 require VS 2010.
572575

573576
- Issue #16067: Add description into MSI file to replace installer's temporary name.

‎Modules/_ctypes/_ctypes.c‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,18 @@ typedef struct {
143143
} DictRemoverObject;
144144

145145
static void
146-
_DictRemover_dealloc(PyObject *_self)
146+
_DictRemover_dealloc(PyObject *myself)
147147
{
148-
DictRemoverObject *self = (DictRemoverObject *)_self;
148+
DictRemoverObject *self = (DictRemoverObject *)myself;
149149
Py_XDECREF(self->key);
150150
Py_XDECREF(self->dict);
151-
Py_TYPE(self)->tp_free(_self);
151+
Py_TYPE(self)->tp_free(myself);
152152
}
153153

154154
static PyObject *
155-
_DictRemover_call(PyObject *_self, PyObject *args, PyObject *kw)
155+
_DictRemover_call(PyObject *myself, PyObject *args, PyObject *kw)
156156
{
157-
DictRemoverObject *self = (DictRemoverObject *)_self;
157+
DictRemoverObject *self = (DictRemoverObject *)myself;
158158
if (self->key && self->dict) {
159159
if (-1 == PyDict_DelItem(self->dict, self->key))
160160
/* XXX Error context */
@@ -2471,17 +2471,17 @@ static PyMemberDef PyCData_members[] = {
24712471
{ NULL },
24722472
};
24732473

2474-
static int PyCData_NewGetBuffer(PyObject *_self, Py_buffer *view, int flags)
2474+
static int PyCData_NewGetBuffer(PyObject *myself, Py_buffer *view, int flags)
24752475
{
2476-
CDataObject *self = (CDataObject *)_self;
2477-
StgDictObject *dict = PyObject_stgdict(_self);
2476+
CDataObject *self = (CDataObject *)myself;
2477+
StgDictObject *dict = PyObject_stgdict(myself);
24782478
Py_ssize_t i;
24792479

24802480
if (view == NULL) return 0;
24812481

24822482
view->buf = self->b_ptr;
2483-
view->obj = _self;
2484-
Py_INCREF(_self);
2483+
view->obj = myself;
2484+
Py_INCREF(myself);
24852485
view->len = self->b_size;
24862486
view->readonly = 0;
24872487
/* use default format character if not set */
@@ -2516,36 +2516,36 @@ PyCData_nohash(PyObject *self)
25162516
}
25172517

25182518
static PyObject *
2519-
PyCData_reduce(PyObject *_self, PyObject *args)
2519+
PyCData_reduce(PyObject *myself, PyObject *args)
25202520
{
2521-
CDataObject *self = (CDataObject *)_self;
2521+
CDataObject *self = (CDataObject *)myself;
25222522

2523-
if (PyObject_stgdict(_self)->flags & (TYPEFLAG_ISPOINTER|TYPEFLAG_HASPOINTER)) {
2523+
if (PyObject_stgdict(myself)->flags & (TYPEFLAG_ISPOINTER|TYPEFLAG_HASPOINTER)) {
25242524
PyErr_SetString(PyExc_ValueError,
25252525
"ctypes objects containing pointers cannot be pickled");
25262526
return NULL;
25272527
}
25282528
return Py_BuildValue("O(O(NN))",
25292529
_unpickle,
2530-
Py_TYPE(_self),
2531-
PyObject_GetAttrString(_self, "__dict__"),
2530+
Py_TYPE(myself),
2531+
PyObject_GetAttrString(myself, "__dict__"),
25322532
PyBytes_FromStringAndSize(self->b_ptr, self->b_size));
25332533
}
25342534

25352535
static PyObject *
2536-
PyCData_setstate(PyObject *_self, PyObject *args)
2536+
PyCData_setstate(PyObject *myself, PyObject *args)
25372537
{
25382538
void *data;
25392539
Py_ssize_t len;
25402540
int res;
25412541
PyObject *dict, *mydict;
2542-
CDataObject *self = (CDataObject *)_self;
2542+
CDataObject *self = (CDataObject *)myself;
25432543
if (!PyArg_ParseTuple(args, "Os#", &dict, &data, &len))
25442544
return NULL;
25452545
if (len > self->b_size)
25462546
len = self->b_size;
25472547
memmove(self->b_ptr, data, len);
2548-
mydict = PyObject_GetAttrString(_self, "__dict__");
2548+
mydict = PyObject_GetAttrString(myself, "__dict__");
25492549
res = PyDict_Update(mydict, dict);
25502550
Py_DECREF(mydict);
25512551
if (res == -1)
@@ -4183,9 +4183,9 @@ Array_init(CDataObject *self, PyObject *args, PyObject *kw)
41834183
}
41844184

41854185
static PyObject *
4186-
Array_item(PyObject *_self, Py_ssize_t index)
4186+
Array_item(PyObject *myself, Py_ssize_t index)
41874187
{
4188-
CDataObject *self = (CDataObject *)_self;
4188+
CDataObject *self = (CDataObject *)myself;
41894189
Py_ssize_t offset, size;
41904190
StgDictObject *stgdict;
41914191

@@ -4209,9 +4209,9 @@ Array_item(PyObject *_self, Py_ssize_t index)
42094209
}
42104210

42114211
static PyObject *
4212-
Array_subscript(PyObject *_self, PyObject *item)
4212+
Array_subscript(PyObject *myself, PyObject *item)
42134213
{
4214-
CDataObject *self = (CDataObject *)_self;
4214+
CDataObject *self = (CDataObject *)myself;
42154215

42164216
if (PyIndex_Check(item)) {
42174217
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
@@ -4220,7 +4220,7 @@ Array_subscript(PyObject *_self, PyObject *item)
42204220
return NULL;
42214221
if (i < 0)
42224222
i += self->b_length;
4223-
return Array_item(_self, i);
4223+
return Array_item(myself, i);
42244224
}
42254225
else if PySlice_Check(item) {
42264226
StgDictObject *stgdict, *itemdict;
@@ -4297,7 +4297,7 @@ Array_subscript(PyObject *_self, PyObject *item)
42974297

42984298
for (cur = start, i = 0; i < slicelen;
42994299
cur += step, i++) {
4300-
PyObject *v = Array_item(_self, cur);
4300+
PyObject *v = Array_item(myself, cur);
43014301
PyList_SET_ITEM(np, i, v);
43024302
}
43034303
return np;
@@ -4311,9 +4311,9 @@ Array_subscript(PyObject *_self, PyObject *item)
43114311
}
43124312

43134313
static int
4314-
Array_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value)
4314+
Array_ass_item(PyObject *myself, Py_ssize_t index, PyObject *value)
43154315
{
4316-
CDataObject *self = (CDataObject *)_self;
4316+
CDataObject *self = (CDataObject *)myself;
43174317
Py_ssize_t size, offset;
43184318
StgDictObject *stgdict;
43194319
char *ptr;
@@ -4340,9 +4340,9 @@ Array_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value)
43404340
}
43414341

43424342
static int
4343-
Array_ass_subscript(PyObject *_self, PyObject *item, PyObject *value)
4343+
Array_ass_subscript(PyObject *myself, PyObject *item, PyObject *value)
43444344
{
4345-
CDataObject *self = (CDataObject *)_self;
4345+
CDataObject *self = (CDataObject *)myself;
43464346

43474347
if (value == NULL) {
43484348
PyErr_SetString(PyExc_TypeError,
@@ -4357,7 +4357,7 @@ Array_ass_subscript(PyObject *_self, PyObject *item, PyObject *value)
43574357
return -1;
43584358
if (i < 0)
43594359
i += self->b_length;
4360-
return Array_ass_item(_self, i, value);
4360+
return Array_ass_item(myself, i, value);
43614361
}
43624362
else if (PySlice_Check(item)) {
43634363
Py_ssize_t start, stop, step, slicelen, otherlen, i, cur;
@@ -4382,7 +4382,7 @@ Array_ass_subscript(PyObject *_self, PyObject *item, PyObject *value)
43824382
int result;
43834383
if (item == NULL)
43844384
return -1;
4385-
result = Array_ass_item(_self, cur, item);
4385+
result = Array_ass_item(myself, cur, item);
43864386
Py_DECREF(item);
43874387
if (result == -1)
43884388
return -1;
@@ -4397,9 +4397,9 @@ Array_ass_subscript(PyObject *_self, PyObject *item, PyObject *value)
43974397
}
43984398

43994399
static Py_ssize_t
4400-
Array_length(PyObject *_self)
4400+
Array_length(PyObject *myself)
44014401
{
4402-
CDataObject *self = (CDataObject *)_self;
4402+
CDataObject *self = (CDataObject *)myself;
44034403
return self->b_length;
44044404
}
44054405

@@ -4685,9 +4685,9 @@ static PyTypeObject Simple_Type = {
46854685
PyCPointer_Type
46864686
*/
46874687
static PyObject *
4688-
Pointer_item(PyObject *_self, Py_ssize_t index)
4688+
Pointer_item(PyObject *myself, Py_ssize_t index)
46894689
{
4690-
CDataObject *self = (CDataObject *)_self;
4690+
CDataObject *self = (CDataObject *)myself;
46914691
Py_ssize_t size;
46924692
Py_ssize_t offset;
46934693
StgDictObject *stgdict, *itemdict;
@@ -4716,9 +4716,9 @@ Pointer_item(PyObject *_self, Py_ssize_t index)
47164716
}
47174717

47184718
static int
4719-
Pointer_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value)
4719+
Pointer_ass_item(PyObject *myself, Py_ssize_t index, PyObject *value)
47204720
{
4721-
CDataObject *self = (CDataObject *)_self;
4721+
CDataObject *self = (CDataObject *)myself;
47224722
Py_ssize_t size;
47234723
Py_ssize_t offset;
47244724
StgDictObject *stgdict, *itemdict;
@@ -4848,14 +4848,14 @@ Pointer_new(PyTypeObject *type, PyObject *args, PyObject *kw)
48484848
}
48494849

48504850
static PyObject *
4851-
Pointer_subscript(PyObject *_self, PyObject *item)
4851+
Pointer_subscript(PyObject *myself, PyObject *item)
48524852
{
4853-
CDataObject *self = (CDataObject *)_self;
4853+
CDataObject *self = (CDataObject *)myself;
48544854
if (PyIndex_Check(item)) {
48554855
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
48564856
if (i == -1 && PyErr_Occurred())
48574857
return NULL;
4858-
return Pointer_item(_self, i);
4858+
return Pointer_item(myself, i);
48594859
}
48604860
else if (PySlice_Check(item)) {
48614861
PySliceObject *slice = (PySliceObject *)item;
@@ -4968,7 +4968,7 @@ Pointer_subscript(PyObject *_self, PyObject *item)
49684968
return NULL;
49694969

49704970
for (cur = start, i = 0; i < len; cur += step, i++) {
4971-
PyObject *v = Pointer_item(_self, cur);
4971+
PyObject *v = Pointer_item(myself, cur);
49724972
PyList_SET_ITEM(np, i, v);
49734973
}
49744974
return np;

‎Modules/_ctypes/callbacks.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
/**************************************************************/
1111

1212
static void
13-
CThunkObject_dealloc(PyObject *_self)
13+
CThunkObject_dealloc(PyObject *myself)
1414
{
15-
CThunkObject *self = (CThunkObject *)_self;
15+
CThunkObject *self = (CThunkObject *)myself;
1616
PyObject_GC_UnTrack(self);
1717
Py_XDECREF(self->converters);
1818
Py_XDECREF(self->callable);
@@ -23,19 +23,19 @@ CThunkObject_dealloc(PyObject *_self)
2323
}
2424

2525
static int
26-
CThunkObject_traverse(PyObject *_self, visitproc visit, void *arg)
26+
CThunkObject_traverse(PyObject *myself, visitproc visit, void *arg)
2727
{
28-
CThunkObject *self = (CThunkObject *)_self;
28+
CThunkObject *self = (CThunkObject *)myself;
2929
Py_VISIT(self->converters);
3030
Py_VISIT(self->callable);
3131
Py_VISIT(self->restype);
3232
return 0;
3333
}
3434

3535
static int
36-
CThunkObject_clear(PyObject *_self)
36+
CThunkObject_clear(PyObject *myself)
3737
{
38-
CThunkObject *self = (CThunkObject *)_self;
38+
CThunkObject *self = (CThunkObject *)myself;
3939
Py_CLEAR(self->converters);
4040
Py_CLEAR(self->callable);
4141
Py_CLEAR(self->restype);

‎Modules/_elementtree.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,9 @@ element_deepcopy(ElementObject* self, PyObject* args)
809809
}
810810

811811
static PyObject*
812-
element_sizeof(PyObject* _self, PyObject* args)
812+
element_sizeof(PyObject* myself, PyObject* args)
813813
{
814-
ElementObject *self = (ElementObject*)_self;
814+
ElementObject *self = (ElementObject*)myself;
815815
Py_ssize_t result = sizeof(ElementObject);
816816
if (self->extra) {
817817
result += sizeof(ElementObjectExtra);

‎Modules/_io/textio.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,12 @@ check_decoded(PyObject *decoded)
282282
#define SEEN_ALL (SEEN_CR | SEEN_LF | SEEN_CRLF)
283283

284284
PyObject *
285-
_PyIncrementalNewlineDecoder_decode(PyObject *_self,
285+
_PyIncrementalNewlineDecoder_decode(PyObject *myself,
286286
PyObject *input, int final)
287287
{
288288
PyObject *output;
289289
Py_ssize_t output_len;
290-
nldecoder_object *self = (nldecoder_object *) _self;
290+
nldecoder_object *self = (nldecoder_object *) myself;
291291

292292
if (self->decoder == NULL) {
293293
PyErr_SetString(PyExc_ValueError,

0 commit comments

Comments
 (0)