From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 12 Jun 2010 19:44:22 +0000 (+0000)
Subject: Merged revisions 81961 via svnmerge from
X-Git-Tag: v3.1.3rc1~638
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d12dfe231ec3719ba5d8ac3e399d77ea72068d49;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 81961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81961 | alexander.belopolsky | 2010-06-12 20:36:28 +0100 (Sat, 12 Jun 2010) | 1 line

  Issue #8973: Expanded Struct.__doc__.
........
---

diff --git a/Modules/_struct.c b/Modules/_struct.c
index c3c79e76866b..222521b1dc10 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1669,7 +1669,11 @@ static struct PyMethodDef s_methods[] = {
     {NULL,       NULL}          /* sentinel */
 };
 
-PyDoc_STRVAR(s__doc__, "Compiled struct object");
+PyDoc_STRVAR(s__doc__, 
+"Struct(fmt) --> compiled struct object\n"
+"\n"
+"Return a new Struct object which writes and reads binary data according to\n"
+"the format string fmt.  See help(struct) for more on format strings.");
 
 #define OFF(x) offsetof(PyStructObject, x)