summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-08-06 05:04:23 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-08-06 05:04:23 (GMT)
commitd987a81d29a16215fff6dd9670cedbcdac82d1b0 (patch)
tree0e5f9527a3a639460e2861bc0ccc7bcc37d94724 /Objects
parent0901d84e3537174ed00e2a684a81d3c0c6890c58 (diff)
parent79b98df0231ae177a676c8a2631e8143d75d84a7 (diff)
downloadcpython-d987a81d29a16215fff6dd9670cedbcdac82d1b0.zip
cpython-d987a81d29a16215fff6dd9670cedbcdac82d1b0.tar.gz
cpython-d987a81d29a16215fff6dd9670cedbcdac82d1b0.tar.bz2
Issue #21279: Merge with 3.4
Diffstat (limited to 'Objects')
-rw-r--r--Objects/unicodeobject.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1eaf2e9..9223c99 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13031,11 +13031,12 @@ unicode_maketrans_impl(PyObject *x, PyObject *y, PyObject *z)
PyDoc_STRVAR(translate__doc__,
"S.translate(table) -> str\n\
\n\
-Return a copy of the string S, where all characters have been mapped\n\
-through the given translation table, which must be a mapping of\n\
-Unicode ordinals to Unicode ordinals, strings, or None.\n\
-Unmapped characters are left untouched. Characters mapped to None\n\
-are deleted.");
+Return a copy of the string S in which each character has been mapped\n\
+through the given translation table. The table must implement\n\
+lookup/indexing via __getitem__, for instance a dictionary or list,\n\
+mapping Unicode ordinals to Unicode ordinals, strings, or None. If\n\
+this operation raises LookupError, the character is left untouched.\n\
+Characters mapped to None are deleted.");
static PyObject*
unicode_translate(PyObject *self, PyObject *table)