Skip to content

Commit 5055af7

Browse files
Apply suggestions from code review
Co-authored-by: Victor Stinner <vstinner@python.org>
1 parent 7e45fc5 commit 5055af7

File tree

5 files changed

+11
-18
lines changed

5 files changed

+11
-18
lines changed

Objects/enumobject.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,7 @@ enum_next_long(enumobject *en, PyObject* next_item)
226226
_PyTuple_Recycle(result);
227227
return result;
228228
}
229-
result = _PyTuple_FromPairSteal(next_index, next_item);
230-
return result;
229+
return _PyTuple_FromPairSteal(next_index, next_item);
231230
}
232231

233232
static PyObject *
@@ -269,8 +268,7 @@ enum_next(PyObject *op)
269268
_PyTuple_Recycle(result);
270269
return result;
271270
}
272-
result = _PyTuple_FromPairSteal(next_index, next_item);
273-
return result;
271+
return _PyTuple_FromPairSteal(next_index, next_item);
274272
}
275273

276274
static PyObject *

Objects/floatobject.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,8 +1541,9 @@ float_as_integer_ratio_impl(PyObject *self)
15411541
goto error;
15421542
}
15431543

1544-
result_pair = _PyTuple_FromPairSteal(numerator, denominator);
1545-
numerator = denominator = NULL;
1544+
Py_DECREF(py_exponent);
1545+
1546+
return _PyTuple_FromPairSteal(numerator, denominator);
15461547

15471548
error:
15481549
Py_XDECREF(py_exponent);

Objects/longobject.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4886,8 +4886,7 @@ long_divmod(PyObject *a, PyObject *b)
48864886
if (l_divmod((PyLongObject*)a, (PyLongObject*)b, &div, &mod) < 0) {
48874887
return NULL;
48884888
}
4889-
z = _PyTuple_FromPairSteal((PyObject *)div, (PyObject *)mod);
4890-
return z;
4889+
return _PyTuple_FromPairSteal((PyObject *)div, (PyObject *)mod);
48914890
}
48924891

48934892

@@ -6177,8 +6176,7 @@ _PyLong_DivmodNear(PyObject *a, PyObject *b)
61776176
goto error;
61786177
}
61796178

6180-
result = _PyTuple_FromPairSteal((PyObject *)quo, (PyObject *)rem);
6181-
return result;
6179+
return _PyTuple_FromPairSteal((PyObject *)quo, (PyObject *)rem);
61826180

61836181
error:
61846182
Py_XDECREF(quo);
@@ -6360,8 +6358,7 @@ int_as_integer_ratio_impl(PyObject *self)
63606358
if (numerator == NULL) {
63616359
return NULL;
63626360
}
6363-
ratio_tuple = _PyTuple_FromPairSteal(numerator, _PyLong_GetOne());
6364-
return ratio_tuple;
6361+
return _PyTuple_FromPairSteal(numerator, _PyLong_GetOne());
63656362
}
63666363

63676364
/*[clinic input]

Objects/odictobject.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,8 +1171,7 @@ OrderedDict_popitem_impl(PyODictObject *self, int last)
11711171
value = _odict_popkey_hash((PyObject *)self, key, NULL, _odictnode_HASH(node));
11721172
if (value == NULL)
11731173
return NULL;
1174-
item = _PyTuple_FromPairSteal(key, value);
1175-
return item;
1174+
return _PyTuple_FromPairSteal(key, value);
11761175
}
11771176

11781177
/* keys() */

Objects/stringlib/unicode_format.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,8 +1184,7 @@ fieldnameiter_next(PyObject *op)
11841184
goto error;
11851185

11861186
/* return a tuple of values */
1187-
result = _PyTuple_FromPairSteal(is_attr_obj, obj);
1188-
return result;
1187+
return _PyTuple_FromPairSteal(is_attr_obj, obj);
11891188

11901189
error:
11911190
Py_XDECREF(is_attr_obj);
@@ -1276,8 +1275,7 @@ formatter_field_name_split(PyObject *Py_UNUSED(module), PyObject *self)
12761275
goto error;
12771276

12781277
/* return a tuple of values */
1279-
result = _PyTuple_FromPairSteal(first_obj, (PyObject *)it);
1280-
return result;
1278+
return _PyTuple_FromPairSteal(first_obj, (PyObject *)it);
12811279

12821280
error:
12831281
Py_XDECREF(it);

0 commit comments

Comments
 (0)