mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-19 15:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 75284 via svnmerge from

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

................
  r75284 | mark.dickinson | 2009-10-08 16:59:20 +0100 (Thu, 08 Oct 2009) | 11 lines

  Merged revisions 75283 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75283 | mark.dickinson | 2009-10-08 16:54:10 +0100 (Thu, 08 Oct 2009) | 4 lines

    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 16:02:50 +00:00
parent 6bf5a2e85b
commit 015fa03058
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/struct.py
View file

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

2
Misc/NEWS
View file

@ -74,6 +74,8 @@ Library
Extension Modules Extension Modules
----------------- -----------------
- Issue #7078: Set struct.__doc__ from _struct.__doc__.
- Issue #6848: Fix curses module build failure on OS X 10.6. - Issue #6848: Fix curses module build failure on OS X 10.6.
Tests Tests

14
Modules/_struct.c
View file

@ -1900,18 +1900,20 @@ static struct PyMethodDef module_functions[] = {
PyDoc_STRVAR(module_doc, PyDoc_STRVAR(module_doc,
"Functions to convert between Python values and C structs.\n\ "Functions to convert between Python values and C structs.\n\
Python bytes objects are used to hold the data representing the C struct\n\ Python bytes objects 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\ and also as format strings (explained below) to describe the layout of data\n\
in the C struct.\n\
\n\ \n\
The optional first format char indicates byte order, size and alignment:\n\ The optional first format char indicates byte order, size and alignment:\n\
@: native order, size & alignment (default)\n\ @: native order, size & alignment (default)\n\
=: native order, std. size & alignment\n\ =: native order, std. size & alignment\n\
<: little-endian, std. size & alignment\n\ <: little-endian, std. size & alignment\n\
>: big-endian, std. size & alignment\n\ >: big-endian, std. size & alignment\n\
!: same as >\n\ !: same as >\n\
\n\ \n\
The remaining chars indicate types of args and must match exactly;\n\ The remaining chars indicate types of args and must match exactly;\n\
these can be preceded by a decimal repeat count:\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\ 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\ h:short; H:unsigned short; i:int; I:unsigned int;\n\
l:long; L:unsigned long; f:float; d:double.\n\ l:long; L:unsigned long; f:float; d:double.\n\
Special cases (preceding decimal count indicates length):\n\ Special cases (preceding decimal count indicates length):\n\