diff options
author | Senthil Kumaran <senthil@uthcode.com> | 2011-06-27 16:07:14 (GMT) |
---|---|---|
committer | Senthil Kumaran <senthil@uthcode.com> | 2011-06-27 16:07:14 (GMT) |
commit | 31877c9d0e4e005ef7faff45b4689358bd2aa93e (patch) | |
tree | 466c64822de1ee039eeb179c8e20404433d6201f /Objects | |
parent | 2353e35570ba5432cc1335c3926f8e5118c6404e (diff) | |
parent | 84e3ccc48dd82f1207a5e02e3dd9f6f0be517fc2 (diff) | |
download | cpython-31877c9d0e4e005ef7faff45b4689358bd2aa93e.zip cpython-31877c9d0e4e005ef7faff45b4689358bd2aa93e.tar.gz cpython-31877c9d0e4e005ef7faff45b4689358bd2aa93e.tar.bz2 |
merge from 3.2
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/bytes_methods.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c index ef91b7f..7233cea 100644 --- a/Objects/bytes_methods.c +++ b/Objects/bytes_methods.c @@ -366,10 +366,10 @@ _Py_bytes_swapcase(char *result, char *s, Py_ssize_t len) PyDoc_STRVAR_shared(_Py_maketrans__doc__, "B.maketrans(frm, to) -> translation table\n\ \n\ -Return a translation table (a bytes object of length 256)\n\ -suitable for use in bytes.translate where each byte in frm is\n\ -mapped to the byte at the same position in to.\n\ -The strings frm and to must be of the same length."); +Return a translation table (a bytes object of length 256) suitable\n\ +for use in the bytes or bytearray translate method where each byte\n\ +in frm is mapped to the byte at the same position in to.\n\ +The bytes objects frm and to must be of the same length."); static Py_ssize_t _getbuffer(PyObject *obj, Py_buffer *view) |