[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2

[senthil.kumaran]

http://hg.python.org/cpython/rev/66a14844e146
changeset:   71017:66a14844e146
parent:      71015:6baa90fa2b6d
parent:      71016:586745894ab8
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Mon Jun 27 09:07:14 2011 -0700
summary:
  merge from 3.2

files:
  Objects/bytes_methods.c |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
--- a/Objects/bytes_methods.c
+++ b/Objects/bytes_methods.c
@@ -366,10 +366,10 @@
 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)

-- 
Repository URL: http://hg.python.org/cpython