[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

Sun Sep 4 08:42:49 CEST 2011

http://hg.python.org/cpython/rev/df673c6d3e0b
changeset: 72267:df673c6d3e0b
parent: 72219:fdd83a93ba37
parent: 72266:792606c351cf
user: Georg Brandl <georg at python.org>
date: Sun Sep 04 08:42:26 2011 +0200
summary:
 Merge with 3.2.
files:
 .hgtags | 2 ++
 Doc/library/sys.rst | 7 ++++++-
 Doc/license.rst | 10 +++++++++-
 Doc/tools/sphinxext/susp-ignored.csv | 16 ++++++++--------
 LICENSE | 6 +++++-
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -91,3 +91,5 @@
 cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
 5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
 ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
+c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
+137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -710,6 +710,8 @@
 
 if sys.platform.startswith('freebsd'):
 # FreeBSD-specific code here...
+ elif sys.platform.startswith('linux'):
+ # Linux-specific code here...
 
 For other systems, the values are:
 
@@ -726,7 +728,9 @@
 
 .. 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 +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 --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -106,10 +106,18 @@
 +----------------+--------------+------------+------------+-----------------+
 | 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 |
 +----------------+--------------+------------+------------+-----------------+
 
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -286,10 +286,10 @@
 documenting/rest,187,.. function:,.. function:: foo(x)
 documenting/rest,187,:bar,:bar: no
 documenting/rest,208,.. rubric:,.. rubric:: Footnotes
-faq/programming,762,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
-faq/programming,762,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,"
-faq/programming,762,:chr,">=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr("
-faq/programming,1047,::,for x in sequence[::-1]:
+faq/programming,,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
+faq/programming,,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,"
+faq/programming,,:chr,">=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr("
+faq/programming,,::,for x in sequence[::-1]:
 faq/windows,229,:EOF, at setlocal enableextensions & python -x %~f0 %* & goto :EOF
 faq/windows,393,:REG,.py :REG_SZ: c:\<path to python>\python.exe -u %s %s
 library/bisect,32,:hi,all(val >= x for val in a[i:hi])
@@ -310,10 +310,10 @@
 library/xmlrpc.client,103,:pass,http://user:pass@host:port/path
 library/xmlrpc.client,103,:port,http://user:pass@host:port/path
 library/xmlrpc.client,103,:pass,user:pass
-license,717,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-license,717,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-license,879,`,"``Software''), to deal in the Software without restriction, including"
-license,879,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
+license,,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+license,,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+license,,`,"``Software''), to deal in the Software without restriction, including"
+license,,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
 reference/lexical_analysis,704,`,$ ? `
 whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
 whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -67,8 +67,12 @@
 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:
-- 
Repository URL: http://hg.python.org/cpython
