Merged revisions 81965 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81965 | mark.dickinson | 2010-06-13 10:17:13 +0100 (Sun, 13 Jun 2010) | 1 line

  Remove unnecessary brackets from docstring optional arguments.
........

diff --git a/Modules/_struct.c b/Modules/_struct.c
index 222521b1dc1045fbb8bf81d7cca2e4437a635b14..f629817dcb26b65d748a835e35ac9e063fa4ccaa 100644 (file)
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1412,7 +1412,7 @@ s_unpack(PyObject *self, PyObject *input)
 }
 
 PyDoc_STRVAR(s_unpack_from__doc__,
-"S.unpack_from(buffer[, offset=0]) -> (v1, v2, ...)\n\
+"S.unpack_from(buffer, offset=0) -> (v1, v2, ...)\n\
 \n\
 Return a tuple containing values unpacked according to the format\n\
 string S.format.  Requires len(buffer[offset:]) >= S.size.  See\n\
@@ -1877,7 +1877,7 @@ unpack(PyObject *self, PyObject *args)
 }
 
 PyDoc_STRVAR(unpack_from_doc,
-"unpack_from(fmt, buffer[, offset=0]) -> (v1, v2, ...)\n\
+"unpack_from(fmt, buffer, offset=0) -> (v1, v2, ...)\n\
 \n\
 Return a tuple containing values unpacked according to the format string\n\
 fmt.  Requires len(buffer[offset:]) >= calcsize(fmt).  See help(struct)\n\