From: Georg Brandl <georg@python.org>
Date: Sun, 4 Sep 2011 06:42:26 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~1572
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbd1e041af2057065339bc643a00a55682427aa7;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

fbd1e041af2057065339bc643a00a55682427aa7
diff --cc Doc/library/sys.rst
index d2986e490b92,7f3d82757cd1..acdde6d62a1c
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@@ -710,23 -707,28 +710,27 @@@ always available
  
        if sys.platform.startswith('freebsd'):
            # FreeBSD-specific code here...
+       elif sys.platform.startswith('linux'):
+           # Linux-specific code here...
  
 -   .. versionchanged:: 3.2.2
 -      Since lots of code check for ``sys.platform == 'linux2'``, and there is
 -      no essential change between Linux 2.x and 3.x, ``sys.platform`` is always
 -      set to ``'linux2'``, even on Linux 3.x.  In Python 3.3 and later, the
 -      value will always be set to ``'linux'``, so it is recommended to always
 -      use the ``startswith`` idiom presented above.
 -
     For other systems, the values are:
  
 -   ====================== ===========================
 -   System                 :data:`platform` value
 -   ====================== ===========================
 -   Linux (2.x *and* 3.x)  ``'linux2'``
 -   Windows                ``'win32'``
 -   Windows/Cygwin         ``'cygwin'``
 -   Mac OS X               ``'darwin'``
 -   OS/2                   ``'os2'``
 -   OS/2 EMX               ``'os2emx'``
 -   ====================== ===========================
 +   ================ ===========================
 +   System           :data:`platform` value
 +   ================ ===========================
 +   Linux            ``'linux'``
 +   Windows          ``'win32'``
 +   Windows/Cygwin   ``'cygwin'``
 +   Mac OS X         ``'darwin'``
 +   OS/2             ``'os2'``
 +   OS/2 EMX         ``'os2emx'``
 +   ================ ===========================
 +
 +   .. versionchanged:: 3.3
 +      On Linux, :attr:`sys.platform` doesn't contain the major version anymore.
-       It is always ``'linux'``, instead of ``'linux2'`` or ``'linux3'``.
++      It is always ``'linux'``, instead of ``'linux2'`` or ``'linux3'``.  Since
++      older Python versions include the version number, it is recommended to
++      always use the ``startswith`` idiom presented above.
  
     .. seealso::
        :attr:`os.name` has a coarser granularity.  :func:`os.uname` gives
@@@ -735,6 -737,6 +739,7 @@@
        The :mod:`platform` module provides detailed checks for the
        system's identity.
  
++
  .. data:: prefix
  
     A string giving the site-specific directory prefix where the platform
diff --cc Doc/license.rst
index 9119f18e98a7,8693a0fb5785..5050ff09f863
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@@ -110,8 -114,10 +114,12 @@@ been GPL-compatible; the table below su
  +----------------+--------------+------------+------------+-----------------+
  | 3.2            | 3.1          | 2011       | PSF        | yes             |
  +----------------+--------------+------------+------------+-----------------+
+ | 3.2.1          | 3.2          | 2011       | PSF        | yes             |
+ +----------------+--------------+------------+------------+-----------------+
+ | 3.2.2          | 3.2.1        | 2011       | PSF        | yes             |
+ +----------------+--------------+------------+------------+-----------------+
 +| 3.3            | 3.2          | 2012       | PSF        | yes             |
 ++----------------+--------------+------------+------------+-----------------+
  
  .. note::
  
diff --cc LICENSE
index d3cde010f0d3,48dbba71baf3..3a37dd6bc896
--- a/LICENSE
+++ b/LICENSE
@@@ -67,9 -67,12 +67,13 @@@ the various releases
      3.0.1           3.0         2009        PSF         yes
      3.1             3.0.1       2009        PSF         yes
      3.1.1           3.1         2009        PSF         yes
-     3.1.2           3.1         2010        PSF         yes
+     3.1.2           3.1.1       2010        PSF         yes
+     3.1.3           3.1.2       2010        PSF         yes
+     3.1.4           3.1.3       2011        PSF         yes
      3.2             3.1         2011        PSF         yes
+     3.2.1           3.2         2011        PSF         yes
+     3.2.2           3.2.1       2011        PSF         yes
 +    3.3             3.2         2012        PSF         yes
  
  Footnotes: