Skip to content

Commit 9d28667

Browse files
Address review
1 parent 53dad5b commit 9d28667

1 file changed

Lines changed: 12 additions & 22 deletions

File tree

Objects/tupleobject.c

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -219,40 +219,30 @@ tuple_alloc_2(void)
219219
}
220220

221221
PyObject *
222-
_PyTuple_FromPair(PyObject *one, PyObject *two)
222+
_PyTuple_FromPair(PyObject *first, PyObject *second)
223223
{
224-
assert(one != NULL);
225-
assert(two != NULL);
224+
assert(first != NULL);
225+
assert(second != NULL);
226226

227-
PyTupleObject *op = tuple_alloc_2();
228-
if (op == NULL) {
229-
return NULL;
230-
}
231-
PyObject **items = op->ob_item;
232-
items[0] = Py_NewRef(one);
233-
items[1] = Py_NewRef(two);
234-
if (maybe_tracked(items[0]) || maybe_tracked(items[1])) {
235-
_PyObject_GC_TRACK(op);
236-
}
237-
return (PyObject *)op;
227+
return _PyTuple_FromPairSteal(Py_NewRef(first), Py_NewRef(second));
238228
}
239229

240230
PyObject *
241-
_PyTuple_FromPairSteal(PyObject *one, PyObject *two)
231+
_PyTuple_FromPairSteal(PyObject *first, PyObject *second)
242232
{
243-
assert(one != NULL);
244-
assert(two != NULL);
233+
assert(first != NULL);
234+
assert(second != NULL);
245235

246236
PyTupleObject *op = tuple_alloc_2();
247237
if (op == NULL) {
248-
Py_DECREF(one);
249-
Py_DECREF(two);
238+
Py_DECREF(first);
239+
Py_DECREF(second);
250240
return NULL;
251241
}
252242
PyObject **items = op->ob_item;
253-
items[0] = one;
254-
items[1] = two;
255-
if (maybe_tracked(one || maybe_tracked(two)) {
243+
items[0] = first;
244+
items[1] = second;
245+
if (maybe_tracked(first || maybe_tracked(second)) {
256246
_PyObject_GC_TRACK(op);
257247
}
258248
return (PyObject *)op;

0 commit comments

Comments
 (0)