#7116: str.join() takes an iterable.

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 25fda8f9d7a50c9d31566b781559c13fe68547fd..b4f62add5e460a7179be1db7231f94c80153b01d 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -996,10 +996,11 @@ string functions based on regular expressions.
    For 8-bit strings, this method is locale-dependent.
 
 
-.. method:: str.join(seq)
+.. method:: str.join(iterable)
 
-   Return a string which is the concatenation of the strings in the sequence *seq*.
-   The separator between elements is the string providing this method.
+   Return a string which is the concatenation of the strings in the
+   :term:`iterable` *iterable*.  The separator between elements is the string
+   providing this method.
 
 
 .. method:: str.ljust(width[, fillchar])

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 1233fc0cc909e70aceed00de396faf88b700cac4..70d90d4ee75896c4c88645bbd48b15c767825017 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1814,10 +1814,10 @@ onError:
 
 
 PyDoc_STRVAR(join__doc__,
-"S.join(sequence) -> string\n\
+"S.join(iterable) -> string\n\
 \n\
 Return a string which is the concatenation of the strings in the\n\
-sequence.  The separator between elements is S.");
+iterable.  The separator between elements is S.");
 
 static PyObject *
 string_join(PyStringObject *self, PyObject *orig)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2028d96b6bf400cdcae5de9424b08b07aa89dc2f..6eac358b67085a971176b691ac0ec0241e75460a 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7154,10 +7154,10 @@ unicode_isnumeric(PyUnicodeObject *self)
 }
 
 PyDoc_STRVAR(join__doc__,
-             "S.join(sequence) -> unicode\n\
+             "S.join(iterable) -> unicode\n\
 \n\
 Return a string which is the concatenation of the strings in the\n\
-sequence.  The separator between elements is S.");
+iterable.  The separator between elements is S.");
 
 static PyObject*
 unicode_join(PyObject *self, PyObject *data)