[Python-checkins] r82382 - in python/branches/release31-maint: Doc/library/struct.rst

[mark.dickinson]

Author: mark.dickinson
Date: Tue Jun 29 22:11:18 2010
New Revision: 82382

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/struct.rst

Modified: python/branches/release31-maint/Doc/library/struct.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/struct.rst	(original)
+++ python/branches/release31-maint/Doc/library/struct.rst	Tue Jun 29 22:11:18 2010
@@ -151,7 +151,11 @@
 ^^^^^^^^^^^^^^^^^
 
 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      |