summaryrefslogtreecommitdiff
path: root/Doc/library/struct.rst
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-06-29 20:10:42 +0000
committerMark Dickinson <dickinsm@gmail.com>2010-06-29 20:10:42 +0000
commit719e4e3ba5a04bec52a04414383781ece8df1ef3 (patch)
tree8d3ef827ff798bbe31b4332e58683649cb18907d /Doc/library/struct.rst
parent578aa56f9aa481cfb2fe5e0342fc20dce139145a (diff)
downloadcpython-git-719e4e3ba5a04bec52a04414383781ece8df1ef3.tar.gz
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 9ba3ce40d4..4b1ba70da4 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 |