Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fbd1e04

Browse files
birkenfeldbirkenfeld
committed
Merge with 3.2.
2 parents fd164c2 + 06ee020 commit fbd1e04

5 files changed

Lines changed: 30 additions & 11 deletions

File tree

‎.hgtags‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,5 @@ a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
9191
cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
9292
5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
9393
ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
94+
c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
95+
137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2

‎Doc/library/sys.rst‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,8 @@ always available.
710710

711711
if sys.platform.startswith('freebsd'):
712712
# FreeBSD-specific code here...
713+
elif sys.platform.startswith('linux'):
714+
# Linux-specific code here...
713715

714716
For other systems, the values are:
715717

@@ -726,7 +728,9 @@ always available.
726728

727729
.. versionchanged:: 3.3
728730
On Linux, :attr:`sys.platform` doesn't contain the major version anymore.
729-
It is always ``'linux'``, instead of ``'linux2'`` or ``'linux3'``.
731+
It is always ``'linux'``, instead of ``'linux2'`` or ``'linux3'``. Since
732+
older Python versions include the version number, it is recommended to
733+
always use the ``startswith`` idiom presented above.
730734

731735
.. seealso::
732736
:attr:`os.name` has a coarser granularity. :func:`os.uname` gives
@@ -735,6 +739,7 @@ always available.
735739
The :mod:`platform` module provides detailed checks for the
736740
system's identity.
737741

742+
738743
.. data:: prefix
739744

740745
A string giving the site-specific directory prefix where the platform

‎Doc/license.rst‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,18 @@ been GPL-compatible; the table below summarizes the various releases.
106106
+----------------+--------------+------------+------------+-----------------+
107107
| 3.1.1 | 3.1 | 2009 | PSF | yes |
108108
+----------------+--------------+------------+------------+-----------------+
109-
| 3.1.2 | 3.1 | 2010 | PSF | yes |
109+
| 3.1.2 | 3.1.1 | 2010 | PSF | yes |
110+
+----------------+--------------+------------+------------+-----------------+
111+
| 3.1.3 | 3.1.2 | 2010 | PSF | yes |
112+
+----------------+--------------+------------+------------+-----------------+
113+
| 3.1.4 | 3.1.3 | 2011 | PSF | yes |
110114
+----------------+--------------+------------+------------+-----------------+
111115
| 3.2 | 3.1 | 2011 | PSF | yes |
112116
+----------------+--------------+------------+------------+-----------------+
117+
| 3.2.1 | 3.2 | 2011 | PSF | yes |
118+
+----------------+--------------+------------+------------+-----------------+
119+
| 3.2.2 | 3.2.1 | 2011 | PSF | yes |
120+
+----------------+--------------+------------+------------+-----------------+
113121
| 3.3 | 3.2 | 2012 | PSF | yes |
114122
+----------------+--------------+------------+------------+-----------------+
115123

‎Doc/tools/sphinxext/susp-ignored.csv‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,10 @@ documenting/rest,130,`,`Link text <http://target>`_
286286
documenting/rest,187,.. function:,.. function:: foo(x)
287287
documenting/rest,187,:bar,:bar: no
288288
documenting/rest,208,.. rubric:,.. rubric:: Footnotes
289-
faq/programming,762,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
290-
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,"
291-
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("
292-
faq/programming,1047,::,for x in sequence[::-1]:
289+
faq/programming,,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
290+
faq/programming,,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,"
291+
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("
292+
faq/programming,,::,for x in sequence[::-1]:
293293
faq/windows,229,:EOF,@setlocal enableextensions & python -x %~f0 %* & goto :EOF
294294
faq/windows,393,:REG,.py :REG_SZ: c:\<path to python>\python.exe -u %s %s
295295
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="
310310
library/xmlrpc.client,103,:pass,http://user:pass@host:port/path
311311
library/xmlrpc.client,103,:port,http://user:pass@host:port/path
312312
library/xmlrpc.client,103,:pass,user:pass
313-
license,717,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
314-
license,717,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
315-
license,879,`,"``Software''), to deal in the Software without restriction, including"
316-
license,879,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
313+
license,,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
314+
license,,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
315+
license,,`,"``Software''), to deal in the Software without restriction, including"
316+
license,,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
317317
reference/lexical_analysis,704,`,$ ? `
318318
whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
319319
whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"

‎LICENSE‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,12 @@ the various releases.
6767
3.0.1 3.0 2009 PSF yes
6868
3.1 3.0.1 2009 PSF yes
6969
3.1.1 3.1 2009 PSF yes
70-
3.1.2 3.1 2010 PSF yes
70+
3.1.2 3.1.1 2010 PSF yes
71+
3.1.3 3.1.2 2010 PSF yes
72+
3.1.4 3.1.3 2011 PSF yes
7173
3.2 3.1 2011 PSF yes
74+
3.2.1 3.2 2011 PSF yes
75+
3.2.2 3.2.1 2011 PSF yes
7276
3.3 3.2 2012 PSF yes
7377

7478
Footnotes:

0 commit comments

Comments
 (0)