summaryrefslogtreecommitdiffstats
path: root/Doc/library/struct.rst
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-06-29 20:09:50 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-06-29 20:09:50 (GMT)
commit284bc0e711debadfaf30c7c18ef51bbe985a78d5 (patch)
tree8d32f23b7da17710581d79f30b12aea531b2dde1 /Doc/library/struct.rst
parent60fa0bf4bdae94275cb186b3266dbfed6007f271 (diff)
downloadcpython-284bc0e711debadfaf30c7c18ef51bbe985a78d5.zip
cpython-284bc0e711debadfaf30c7c18ef51bbe985a78d5.tar.gz
cpython-284bc0e711debadfaf30c7c18ef51bbe985a78d5.tar.bz2
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/library/struct.rst')
-rw-r--r--Doc/library/struct.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
index bc763e0..f1f019d 100644
--- a/Doc/library/struct.rst
+++ b/Doc/library/struct.rst
@@ -156,7 +156,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 |