summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-05-26 19:37:54 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-05-26 19:37:54 (GMT)
commit1af03e98d9ab87b4e9aa76caafba0dbc52cfd750 (patch)
treebf7fbe37bc2ef4cfef5f675a29da674b0d80b814
parent442914d265b9752f78251e3792f5155f14a9dcc9 (diff)
downloadcpython-1af03e98d9ab87b4e9aa76caafba0dbc52cfd750.zip
cpython-1af03e98d9ab87b4e9aa76caafba0dbc52cfd750.tar.gz
cpython-1af03e98d9ab87b4e9aa76caafba0dbc52cfd750.tar.bz2
Change list.extend() error msgs and NEWS to reflect that list.extend()
now takes any iterable argument, not only sequences. NEEDS DOC CHANGES -- but I don't think we settled on a concise way to say this stuff.
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/listobject.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 1dc300d..3a15837 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -100,7 +100,8 @@ Core
map(), filter(), reduce(), zip()
list(), tuple() (PySequence_Tuple() and PySequence_Fast() in C API)
max(), min()
- .join() method of strings
+ join() method of strings
+ extend() method of lists
'x in y' and 'x not in y' (PySequence_Contains() in C API)
operator.countOf() (PySequence_Count() in C API)
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 9fb3e82..e595c85 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -644,7 +644,7 @@ listextend_internal(PyListObject *self, PyObject *b)
static PyObject *
list_inplace_concat(PyListObject *self, PyObject *other)
{
- other = PySequence_Fast(other, "argument to += must be a sequence");
+ other = PySequence_Fast(other, "argument to += must be iterable");
if (!other)
return NULL;
@@ -664,7 +664,7 @@ listextend(PyListObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "O:extend", &b))
return NULL;
- b = PySequence_Fast(b, "list.extend() argument must be a sequence");
+ b = PySequence_Fast(b, "list.extend() argument must be iterable");
if (!b)
return NULL;