mirror of https://github.com/python/cpython
Revert "gh-96844: Improve error message of list.remove (gh-106455)" (#116956)
This reverts commit 217f47d6e5
.
This commit is contained in:
parent
2a4cbf17af
commit
f6cdc6b4a1
|
@ -430,10 +430,10 @@ Simple example::
|
||||||
>>> [1, 2, 3].remove(42)
|
>>> [1, 2, 3].remove(42)
|
||||||
Traceback (most recent call last):
|
Traceback (most recent call last):
|
||||||
File "<stdin>", line 1, in <module>
|
File "<stdin>", line 1, in <module>
|
||||||
ValueError: 42 is not in list
|
ValueError: list.remove(x): x not in list
|
||||||
|
|
||||||
That doctest succeeds if :exc:`ValueError` is raised, with the ``42 is not in list``
|
That doctest succeeds if :exc:`ValueError` is raised, with the ``list.remove(x):
|
||||||
detail as shown.
|
x not in list`` detail as shown.
|
||||||
|
|
||||||
The expected output for an exception must start with a traceback header, which
|
The expected output for an exception must start with a traceback header, which
|
||||||
may be either of the following two lines, indented the same as the first line of
|
may be either of the following two lines, indented the same as the first line of
|
||||||
|
|
|
@ -329,7 +329,7 @@ class ElementTreeTest(unittest.TestCase):
|
||||||
self.serialize_check(element, '<tag key="value" />') # 5
|
self.serialize_check(element, '<tag key="value" />') # 5
|
||||||
with self.assertRaises(ValueError) as cm:
|
with self.assertRaises(ValueError) as cm:
|
||||||
element.remove(subelement)
|
element.remove(subelement)
|
||||||
self.assertIn('not in list', str(cm.exception))
|
self.assertEqual(str(cm.exception), 'list.remove(x): x not in list')
|
||||||
self.serialize_check(element, '<tag key="value" />') # 6
|
self.serialize_check(element, '<tag key="value" />') # 6
|
||||||
element[0:0] = [subelement, subelement, subelement]
|
element[0:0] = [subelement, subelement, subelement]
|
||||||
self.serialize_check(element[1], '<subtag />')
|
self.serialize_check(element[1], '<subtag />')
|
||||||
|
|
|
@ -3194,7 +3194,7 @@ list_remove_impl(PyListObject *self, PyObject *value)
|
||||||
else if (cmp < 0)
|
else if (cmp < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
PyErr_Format(PyExc_ValueError, "%R is not in list", value);
|
PyErr_SetString(PyExc_ValueError, "list.remove(x): x not in list");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue