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.
  ........
................

diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
index be20caa985b7c4747e2ac42e0fdcee54291fd8c5..6fbce6c7f64313593761e50fcfbb5026bb89cd4a 100644 (file)
--- 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      |