8000 bpo-39573: Update clinic to use Py_IS_TYPE() function (GH-18507) · python/cpython@9aeb0ef · GitHub
[go: up one dir, main page]
Skip to content

Commit 9aeb0ef

Browse files
corona10corona10
authored
bpo-39573: Update clinic to use Py_IS_TYPE() function (GH-18507)
1 parent d212c3c commit 9aeb0ef

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

‎Misc/NEWS.d/next/Core and Builtins/2020-02-14-10-08-53.bpo-39573.BIIX2M.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update clinic tool to use :c:func:`Py_IS_TYPE`. Patch by Dong-hee Na.

‎Modules/_io/clinic/bufferedio.c.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ _io_BufferedRWPair___init__(PyObject *self, PyObject *args, PyObject *kwargs)
578578
PyObject *writer;
579579
Py_ssize_t buffer_size = DEFAULT_BUFFER_SIZE;
580580

581-
if ((Py_TYPE(self) == &PyBufferedRWPair_Type) &&
581+
if (Py_IS_TYPE(self, &PyBufferedRWPair_Type) &&
582582
!_PyArg_NoKeywords("BufferedRWPair", kwargs)) {
583583
goto exit;
584584
}
@@ -672,4 +672,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs)
672672
exit:
673673
return return_value;
674674
}
675-
/*[clinic end generated code: output=7246104f6c7d3167 input=a9049054013a1b77]*/
675+
/*[clinic end generated code: output=7d9ad40c95bdd808 input=a9049054013a1b77]*/

‎Modules/clinic/_bz2module.c.h

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Objects/clinic/listobject.c.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tools/clinic/clinic.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3585,17 +3585,14 @@ def set_template_dict(self, template_dict):
35853585
cls = self.function.cls
35863586

35873587
if ((kind in (METHOD_NEW, METHOD_INIT)) and cls and cls.typedef):
3588+
type_object = self.function.cls.type_object
35883589
if kind == METHOD_NEW:
3589-
passed_in_type = self.name
3590+
type_check = '({} == {})'.format(self.name, type_object)
35903591
else:
3591-
passed_in_type = 'Py_TYPE({})'.format(self.name)
3592-
3593-
line = '({passed_in_type} == {type_object}) &&\n '
3594-
d = {
3595-
'type_object': self.function.cls.type_object,
3596-
6BD7 'passed_in_type': passed_in_type
3597-
}
3598-
template_dict['self_type_check'] = line.format_map(d)
3592+
type_check = 'Py_IS_TYPE({}, {})'.format(self.name, type_object)
3593+
3594+
line = '{} &&\n '.format(type_check)
3595+
template_dict['self_type_check'] = line
35993596

36003597

36013598

0 commit comments

Comments
 (0)
0