summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-01-22 20:31:39 (GMT)
committerGeorg Brandl <georg@python.org>2012-01-22 20:31:39 (GMT)
commit20f6bc20bd3024b1b710d2833a74f2a7f2ba8571 (patch)
tree97e4722feee2a1d64562e1f7fb4096d6758693dd /Objects
parentce798520778e9cb41adfdc4f0a3cb5085a0b11be (diff)
parentbeca27a394d4e3988a4c08e670a5b42f1e7eb4a0 (diff)
downloadcpython-20f6bc20bd3024b1b710d2833a74f2a7f2ba8571.zip
cpython-20f6bc20bd3024b1b710d2833a74f2a7f2ba8571.tar.gz
cpython-20f6bc20bd3024b1b710d2833a74f2a7f2ba8571.tar.bz2
merge with 3.2
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytesobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 9cd16f6..a98cdcf 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1426,7 +1426,7 @@ PyDoc_STRVAR(strip__doc__,
"B.strip([bytes]) -> bytes\n\
\n\
Strip leading and trailing bytes contained in the argument.\n\
-If the argument is omitted, strip trailing ASCII whitespace.");
+If the argument is omitted, strip leading and trailing ASCII whitespace.");
static PyObject *
bytes_strip(PyBytesObject *self, PyObject *args)
{