Skip to content

Commit dffe4c0

Browse files
petdancepetdance
authored
bpo-39573: Finish converting to new Py_IS_TYPE() macro (GH-18601)
1 parent 22a9a54 commit dffe4c0

23 files changed

+56
-57
lines changed

‎Include/py_curses.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ typedef struct {
6464
char *encoding;
6565
} PyCursesWindowObject;
6666

67-
#define PyCursesWindow_Check(v) (Py_TYPE(v) == &PyCursesWindow_Type)
67+
#define PyCursesWindow_Check(v) Py_IS_TYPE(v, &PyCursesWindow_Type)
6868

6969
#define PyCurses_CAPSULE_NAME "_curses._C_API"
7070

@@ -97,4 +97,3 @@ static const char catchall_NULL[] = "curses function returned NULL";
9797

9898
#endif /* !defined(Py_CURSES_H) */
9999

100-

‎Modules/_asynciomodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ future_set_exception(FutureObj *fut, PyObject *exc)
572572
PyErr_SetString(PyExc_TypeError, "invalid exception object");
573573
return NULL;
574574
}
575-
if ((PyObject*)Py_TYPE(exc_val) == PyExc_StopIteration) {
575+
if (Py_IS_TYPE(exc_val, (PyTypeObject *)PyExc_StopIteration)) {
576576
Py_DECREF(exc_val);
577577
PyErr_SetString(PyExc_TypeError,
578578
"StopIteration interacts badly with generators "

‎Modules/_collectionsmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ deque_copy(PyObject *deque, PyObject *Py_UNUSED(ignored))
489489
{
490490
PyObject *result;
491491
dequeobject *old_deque = (dequeobject *)deque;
492-
if (Py_TYPE(deque) == &deque_type) {
492+
if (Py_IS_TYPE(deque, &deque_type)) {
493493
dequeobject *new_deque;
494494
PyObject *rv;
495495

‎Modules/_elementtree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2366,7 +2366,7 @@ typedef struct {
23662366
char insert_pis;
23672367
} TreeBuilderObject;
23682368

2369-
#define TreeBuilder_CheckExact(op) (Py_TYPE(op) == &TreeBuilder_Type)
2369+
#define TreeBuilder_CheckExact(op) Py_IS_TYPE((op), &TreeBuilder_Type)
23702370

23712371
/* -------------------------------------------------------------------- */
23722372
/* constructor and destructor */

‎Modules/_io/bufferedio.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,8 +1449,8 @@ _io_BufferedReader___init___impl(buffered *self, PyObject *raw,
14491449
return -1;
14501450
_bufferedreader_reset_buf(self);
14511451

1452-
self->fast_closed_checks = (Py_TYPE(self) == &PyBufferedReader_Type &&
1453-
Py_TYPE(raw) == &PyFileIO_Type);
1452+
self->fast_closed_checks = (Py_IS_TYPE(self, &PyBufferedReader_Type) &&
1453+
Py_IS_TYPE(raw, &PyFileIO_Type));
14541454

14551455
self->ok = 1;
14561456
return 0;
@@ -1795,8 +1795,8 @@ _io_BufferedWriter___init___impl(buffered *self, PyObject *raw,
17951795
_bufferedwriter_reset_buf(self);
17961796
self->pos = 0;
17971797

1798-
self->fast_closed_checks = (Py_TYPE(self) == &PyBufferedWriter_Type &&
1799-
Py_TYPE(raw) == &PyFileIO_Type);
1798+
self->fast_closed_checks = (Py_IS_TYPE(self, &PyBufferedWriter_Type) &&
1799+
Py_IS_TYPE(raw, &PyFileIO_Type));
18001800

18011801
self->ok = 1;
18021802
return 0;
@@ -2309,8 +2309,8 @@ _io_BufferedRandom___init___impl(buffered *self, PyObject *raw,
23092309
_bufferedwriter_reset_buf(self);
23102310
self->pos = 0;
23112311

2312-
self->fast_closed_checks = (Py_TYPE(self) == &PyBufferedRandom_Type &&
2313-
Py_TYPE(raw) == &PyFileIO_Type);
2312+
self->fast_closed_checks = (Py_IS_TYPE(self, &PyBufferedRandom_Type) &&
2313+
Py_IS_TYPE(raw, &PyFileIO_Type));
23142314

23152315
self->ok = 1;
23162316
return 0;

‎Modules/_io/stringio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ stringio_iternext(stringio *self)
402402
CHECK_CLOSED(self);
403403
ENSURE_REALIZED(self);
404404

405-
if (Py_TYPE(self) == &PyStringIO_Type) {
405+
if (Py_IS_TYPE(self, &PyStringIO_Type)) {
406406
/* Skip method call overhead for speed */
407407
line = _stringio_readline(self, -1);
408408
}

‎Modules/_io/textio.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ _textiowrapper_decode(PyObject *decoder, PyObject *bytes, int eof)
897897
{
898898
PyObject *chars;
899899

900-
if (Py_TYPE(decoder) == &PyIncrementalNewlineDecoder_Type)
900+
if (Py_IS_TYPE(decoder, &PyIncrementalNewlineDecoder_Type))
901901
chars = _PyIncrementalNewlineDecoder_decode(decoder, bytes, eof);
902902
else
903903
chars = PyObject_CallMethodObjArgs(decoder, _PyIO_str_decode, bytes,
@@ -1226,15 +1226,15 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
12261226
/* Finished sorting out the codec details */
12271227
Py_CLEAR(codec_info);
12281228

1229-
if (Py_TYPE(buffer) == &PyBufferedReader_Type ||
1230-
Py_TYPE(buffer) == &PyBufferedWriter_Type ||
1231-
Py_TYPE(buffer) == &PyBufferedRandom_Type)
1229+
if (Py_IS_TYPE(buffer, &PyBufferedReader_Type) ||
1230+
Py_IS_TYPE(buffer, &PyBufferedWriter_Type) ||
1231+
Py_IS_TYPE(buffer, &PyBufferedRandom_Type))
12321232
{
12331233
if (_PyObject_LookupAttrId(buffer, &PyId_raw, &raw) < 0)
12341234
goto error;
12351235
/* Cache the raw FileIO object to speed up 'closed' checks */
12361236
if (raw != NULL) {
1237-
if (Py_TYPE(raw) == &PyFileIO_Type)
1237+
if (Py_IS_TYPE(raw, &PyFileIO_Type))
12381238
self->raw = raw;
12391239
else
12401240
Py_DECREF(raw);
@@ -1466,7 +1466,7 @@ textiowrapper_closed_get(textio *self, void *context);
14661466
do { \
14671467
int r; \
14681468
PyObject *_res; \
1469-
if (Py_TYPE(self) == &PyTextIOWrapper_Type) { \
1469+
if (Py_IS_TYPE(self, &PyTextIOWrapper_Type)) { \
14701470
if (self->raw != NULL) \
14711471
r = _PyFileIO_closed(self->raw); \
14721472
else { \
@@ -1937,7 +1937,7 @@ _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n)
19371937
if (bytes == NULL)
19381938
goto fail;
19391939

1940-
if (Py_TYPE(self->decoder) == &PyIncrementalNewlineDecoder_Type)
1940+
if (Py_IS_TYPE(self->decoder, &PyIncrementalNewlineDecoder_Type))
19411941
decoded = _PyIncrementalNewlineDecoder_decode(self->decoder,
19421942
bytes, 1);
19431943
else
@@ -3079,7 +3079,7 @@ textiowrapper_iternext(textio *self)
30793079
CHECK_ATTACHED(self);
30803080

30813081
self->telling = 0;
3082-
if (Py_TYPE(self) == &PyTextIOWrapper_Type) {
3082+
if (Py_IS_TYPE(self, &PyTextIOWrapper_Type)) {
30833083
/* Skip method call overhead for speed */
30843084
line = _textiowrapper_readline(self, -1);
30853085
}

‎Modules/_pickle.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4974,7 +4974,7 @@ Pickler_set_memo(PicklerObject *self, PyObject *obj, void *Py_UNUSED(ignored))
49744974
return -1;
49754975
}
49764976

4977-
if (Py_TYPE(obj) == &PicklerMemoProxyType) {
4977+
if (Py_IS_TYPE(obj, &PicklerMemoProxyType)) {
49784978
PicklerObject *pickler =
49794979
((PicklerMemoProxyObject *)obj)->pickler;
49804980

@@ -7519,7 +7519,7 @@ Unpickler_set_memo(UnpicklerObject *self, PyObject *obj, void *Py_UNUSED(ignored
75197519
return -1;
75207520
}
75217521

7522-
if (Py_TYPE(obj) == &UnpicklerMemoProxyType) {
7522+
if (Py_IS_TYPE(obj, &UnpicklerMemoProxyType)) {
75237523
UnpicklerObject *unpickler =
75247524
((UnpicklerMemoProxyObject *)obj)->unpickler;
75257525

‎Modules/_threadmodule.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ _ldict(localobject *self)
844844
}
845845
}
846846
else {
847-
assert(Py_TYPE(dummy) == &localdummytype);
847+
assert(Py_IS_TYPE(dummy, &localdummytype));
848848
ldict = ((localdummyobject *) dummy)->localdict;
849849
}
850850

@@ -1209,7 +1209,7 @@ release_sentinel(void *wr_raw)
12091209
PyObject *obj = PyWeakref_GET_OBJECT(wr);
12101210
lockobject *lock;
12111211
if (obj != Py_None) {
1212-
assert(Py_TYPE(obj) == &Locktype);
1212+
assert(Py_IS_TYPE(obj, &Locktype));
12131213
lock = (lockobject *) obj;
12141214
if (lock->locked) {
12151215
PyThread_release_lock(lock->lock_lock);

‎Modules/cjkcodecs/multibytecodec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typedef struct {
6565
MultibyteCodec *codec;
6666
} MultibyteCodecObject;
6767

68-
#define MultibyteCodec_Check(op) (Py_TYPE(op) == &MultibyteCodec_Type)
68+
#define MultibyteCodec_Check(op) Py_IS_TYPE((op), &MultibyteCodec_Type)
6969

7070
#define _MultibyteStatefulCodec_HEAD \
7171
PyObject_HEAD \

0 commit comments

Comments
 (0)