From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 21 Dec 2010 18:56:38 +0000 (+0000)
Subject: Merged revisions 87421 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~144
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fc6b6c4536417283c6f52b6dfb4c82afb372448;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 87421 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87421 | antoine.pitrou | 2010-12-21 19:49:01 +0100 (mar., 21 déc. 2010) | 4 lines

  Suggest sys.maxsize as a reliable way to know whether the interpreter is 64-bit.
  (part of #10735)
........
---

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index f4ef6805a10c..56518f79e84c 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -36,6 +36,16 @@ Cross Platform
    and then only if the executable points to the Python interpreter.  Reasonable
    defaults are used when the above needs are not met.
 
+   .. note::
+
+      On Mac OS X (and perhaps other platforms), executable files may be
+      universal files containing multiple architectures.
+
+      To get at the "64-bitness" of the current interpreter, it is more
+      reliable to query the :attr:`sys.maxsize` attribute::
+
+         is_64bits = sys.maxsize > 2**32
+
 
 .. function:: machine()
 
@@ -186,7 +196,7 @@ Windows Platform
 
    .. note::
 
-      Note: this function works best with Mark Hammond's
+      This function works best with Mark Hammond's
       :mod:`win32all` package installed, but also on Python 2.3 and
       later (support for this was added in Python 2.6). It obviously
       only runs on Win32 compatible platforms.