diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2010-06-29 20:11:18 (GMT) |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2010-06-29 20:11:18 (GMT) |
commit | 881c1b4c102e9404c10de159a7f01442c2d7224e (patch) | |
tree | fde4200a5e09cfdc667cec606880c05f7b69bc2a /Doc | |
parent | f6f3f53714d08dc3dc30c66037a275361dea224e (diff) | |
download | cpython-881c1b4c102e9404c10de159a7f01442c2d7224e.zip cpython-881c1b4c102e9404c10de159a7f01442c2d7224e.tar.gz cpython-881c1b4c102e9404c10de159a7f01442c2d7224e.tar.bz2 |
Merged revisions 82381 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r82381 | mark.dickinson | 2010-06-29 21:10:42 +0100 (Tue, 29 Jun 2010) | 9 lines
Merged revisions 82379 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r82379 | mark.dickinson | 2010-06-29 21:09:12 +0100 (Tue, 29 Jun 2010) | 1 line
Issue #1789: clarify that the 'size' column in struct docs refers to standard size.
........
................
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/struct.rst | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst index be20caa..6fbce6c 100644 --- a/Doc/library/struct.rst +++ b/Doc/library/struct.rst @@ -151,7 +151,11 @@ Format Characters ^^^^^^^^^^^^^^^^^ Format characters have the following meaning; the conversion between C and -Python values should be obvious given their types: +Python values should be obvious given their types. The 'Standard size' column +refers to the size of the packed value in bytes when using standard size; that +is, when the format string starts with one of ``'<'``, ``'>'``, ``'!'`` or +``'='``. When using native size, the size of the packed value is +platform-dependent. +--------+-------------------------+--------------------+----------------+------------+ | Format | C Type | Python type | Standard size | Notes | |