Issue #7078: _struct.__doc__ was being ignored. Import it into struct.

Also add description of '?' struct format character.  Thanks Gabriel
Genellina for the patch.
This commit is contained in:
Mark Dickinson 2009-10-08 15:54:10 +00:00
parent a5b642c933
commit 3d830828de
3 changed files with 13 additions and 8 deletions

View File

@ -1,2 +1,3 @@
from _struct import *
from _struct import _clearcache
from _struct import __doc__

View File

@ -1370,6 +1370,8 @@ C-API
Extension Modules
-----------------
- Issue #7078: Set struct.__doc__ from _struct.__doc__.
- Issue #3366: Add gamma function to math module.
- Issue #6823: Allow time.strftime() to accept a tuple with a isdst field

View File

@ -1868,9 +1868,10 @@ static struct PyMethodDef module_functions[] = {
/* Module initialization */
PyDoc_STRVAR(module_doc,
"Functions to convert between Python values and C structs.\n\
Python strings are used to hold the data representing the C struct\n\
and also as format strings to describe the layout of data in the C struct.\n\
"Functions to convert between Python values and C structs represented\n\
as Python strings. It uses format strings (explained below) as compact\n\
descriptions of the lay-out of the C structs and the intended conversion\n\
to/from Python values.\n\
\n\
The optional first format char indicates byte order, size and alignment:\n\
@: native order, size & alignment (default)\n\
@ -1882,6 +1883,7 @@ The optional first format char indicates byte order, size and alignment:\n\
The remaining chars indicate types of args and must match exactly;\n\
these can be preceded by a decimal repeat count:\n\
x: pad byte (no data); c:char; b:signed byte; B:unsigned byte;\n\
?: _Bool (requires C99; if not available, char is used instead)\n\
h:short; H:unsigned short; i:int; I:unsigned int;\n\
l:long; L:unsigned long; f:float; d:double.\n\
Special cases (preceding decimal count indicates length):\n\