mirror of https://github.com/python/cpython
Merge with 3.2.
This commit is contained in:
commit
fbd1e041af
2
.hgtags
2
.hgtags
|
@ -91,3 +91,5 @@ a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
|
||||||
cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
|
cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
|
||||||
5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
|
5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
|
||||||
ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
|
ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
|
||||||
|
c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
|
||||||
|
137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
|
||||||
|
|
|
@ -710,6 +710,8 @@ always available.
|
||||||
|
|
||||||
if sys.platform.startswith('freebsd'):
|
if sys.platform.startswith('freebsd'):
|
||||||
# FreeBSD-specific code here...
|
# FreeBSD-specific code here...
|
||||||
|
elif sys.platform.startswith('linux'):
|
||||||
|
# Linux-specific code here...
|
||||||
|
|
||||||
For other systems, the values are:
|
For other systems, the values are:
|
||||||
|
|
||||||
|
@ -726,7 +728,9 @@ always available.
|
||||||
|
|
||||||
.. versionchanged:: 3.3
|
.. versionchanged:: 3.3
|
||||||
On Linux, :attr:`sys.platform` doesn't contain the major version anymore.
|
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::
|
.. seealso::
|
||||||
:attr:`os.name` has a coarser granularity. :func:`os.uname` gives
|
:attr:`os.name` has a coarser granularity. :func:`os.uname` gives
|
||||||
|
@ -735,6 +739,7 @@ always available.
|
||||||
The :mod:`platform` module provides detailed checks for the
|
The :mod:`platform` module provides detailed checks for the
|
||||||
system's identity.
|
system's identity.
|
||||||
|
|
||||||
|
|
||||||
.. data:: prefix
|
.. data:: prefix
|
||||||
|
|
||||||
A string giving the site-specific directory prefix where the platform
|
A string giving the site-specific directory prefix where the platform
|
||||||
|
|
|
@ -106,10 +106,18 @@ been GPL-compatible; the table below summarizes the various releases.
|
||||||
+----------------+--------------+------------+------------+-----------------+
|
+----------------+--------------+------------+------------+-----------------+
|
||||||
| 3.1.1 | 3.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 | 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 |
|
| 3.3 | 3.2 | 2012 | PSF | yes |
|
||||||
+----------------+--------------+------------+------------+-----------------+
|
+----------------+--------------+------------+------------+-----------------+
|
||||||
|
|
||||||
|
|
|
@ -286,10 +286,10 @@ documenting/rest,130,`,`Link text <http://target>`_
|
||||||
documenting/rest,187,.. function:,.. function:: foo(x)
|
documenting/rest,187,.. function:,.. function:: foo(x)
|
||||||
documenting/rest,187,:bar,:bar: no
|
documenting/rest,187,:bar,:bar: no
|
||||||
documenting/rest,208,.. rubric:,.. rubric:: Footnotes
|
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,,: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,,: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,,: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,,::,for x in sequence[::-1]:
|
||||||
faq/windows,229,:EOF,@setlocal enableextensions & python -x %~f0 %* & goto :EOF
|
faq/windows,229,:EOF,@setlocal enableextensions & python -x %~f0 %* & goto :EOF
|
||||||
faq/windows,393,:REG,.py :REG_SZ: c:\<path to python>\python.exe -u %s %s
|
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])
|
library/bisect,32,:hi,all(val >= x for val in a[i:hi])
|
||||||
|
@ -310,10 +310,10 @@ library/urllib.request,,:lang,"xmlns=""http://www.w3.org/1999/xhtml"" xml:lang="
|
||||||
library/xmlrpc.client,103,:pass,http://user:pass@host:port/path
|
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,:port,http://user:pass@host:port/path
|
||||||
library/xmlrpc.client,103,:pass,user:pass
|
library/xmlrpc.client,103,:pass,user:pass
|
||||||
license,717,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
license,,`,* 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,,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||||
license,879,`,"``Software''), to deal in the Software without restriction, including"
|
license,,`,"``Software''), to deal in the Software without restriction, including"
|
||||||
license,879,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
|
license,,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
|
||||||
reference/lexical_analysis,704,`,$ ? `
|
reference/lexical_analysis,704,`,$ ? `
|
||||||
whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
|
whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
|
||||||
whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"
|
whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"
|
||||||
|
|
|
6
LICENSE
6
LICENSE
|
@ -67,8 +67,12 @@ the various releases.
|
||||||
3.0.1 3.0 2009 PSF yes
|
3.0.1 3.0 2009 PSF yes
|
||||||
3.1 3.0.1 2009 PSF yes
|
3.1 3.0.1 2009 PSF yes
|
||||||
3.1.1 3.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 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
|
3.3 3.2 2012 PSF yes
|
||||||
|
|
||||||
Footnotes:
|
Footnotes:
|
||||||
|
|
Loading…
Reference in New Issue