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

Skip to content

Commit 3484a87

Browse files
birkenfeldbirkenfeld
committed
Merge with release clone.
2 parents e3bb2cf + d42b7a3 commit 3484a87

12 files changed

Lines changed: 94 additions & 54 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: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -699,26 +699,36 @@ always available.
699699
This string contains a platform identifier that can be used to append
700700
platform-specific components to :data:`sys.path`, for instance.
701701

702-
For Unix systems, this is the lowercased OS name as returned by ``uname -s``
703-
with the first part of the version as returned by ``uname -r`` appended,
704-
e.g. ``'sunos5'`` or ``'linux2'``, *at the time when Python was built*.
705-
Unless you want to test for a specific system version, it is therefore
706-
recommended to use the following idiom::
707-
708-
if sys.platform.startswith('linux'):
702+
For most Unix systems, this is the lowercased OS name as returned by ``uname
703+
-s`` with the first part of the version as returned by ``uname -r`` appended,
704+
e.g. ``'sunos5'``, *at the time when Python was built*. Unless you want to
705+
test for a specific system version, it is therefore recommended to use the
706+
following idiom::
707+
708+
if sys.platform.startswith('freebsd'):
709+
# FreeBSD-specific code here...
710+
elif sys.platform.startswith('linux'):
709711
# Linux-specific code here...
710712

713+
.. versionchanged:: 3.2.2
714+
Since lots of code check for ``sys.platform == 'linux2'``, and there is
715+
no essential change between Linux 2.x and 3.x, ``sys.platform`` is always
716+
set to ``'linux2'``, even on Linux 3.x. In Python 3.3 and later, the
717+
value will always be set to ``'linux'``, so it is recommended to always
718+
use the ``startswith`` idiom presented above.
719+
711720
For other systems, the values are:
712721

713-
================ ===========================
714-
System :data:`platform` value
715-
================ ===========================
716-
Windows ``'win32'``
717-
Windows/Cygwin ``'cygwin'``
718-
Mac OS X ``'darwin'``
719-
OS/2 ``'os2'``
720-
OS/2 EMX ``'os2emx'``
721-
================ ===========================
722+
====================== ===========================
723+
System :data:`platform` value
724+
====================== ===========================
725+
Linux (2.x *and* 3.x) ``'linux2'``
726+
Windows ``'win32'``
727+
Windows/Cygwin ``'cygwin'``
728+
Mac OS X ``'darwin'``
729+
OS/2 ``'os2'``
730+
OS/2 EMX ``'os2emx'``
731+
====================== ===========================
722732

723733
.. seealso::
724734
:attr:`os.name` has a coarser granularity. :func:`os.uname` gives

‎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

114122
.. note::
115123

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ documenting/rest,130,`,`Link text <http://target>`_
193193
documenting/rest,187,.. function:,.. function:: foo(x)
194194
documenting/rest,187,:bar,:bar: no
195195
documenting/rest,208,.. rubric:,.. rubric:: Footnotes
196-
faq/programming,762,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
197-
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,"
198-
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("
199-
faq/programming,1047,::,for x in sequence[::-1]:
196+
faq/programming,,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
197+
faq/programming,,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,"
198+
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("
199+
faq/programming,,::,for x in sequence[::-1]:
200200
faq/windows,229,:EOF,@setlocal enableextensions & python -x %~f0 %* & goto :EOF
201201
faq/windows,393,:REG,.py :REG_SZ: c:\<path to python>\python.exe -u %s %s
202202
library/bisect,32,:hi,all(val >= x for val in a[i:hi])
@@ -217,10 +217,10 @@ library/urllib.request,,:lang,"xmlns=""http://www.w3.org/1999/xhtml"" xml:lang="
217217
library/xmlrpc.client,103,:pass,http://user:pass@host:port/path
218218
library/xmlrpc.client,103,:port,http://user:pass@host:port/path
219219
library/xmlrpc.client,103,:pass,user:pass
220-
license,717,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
221-
license,717,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
222-
license,879,`,"``Software''), to deal in the Software without restriction, including"
223-
license,879,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
220+
license,,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
221+
license,,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
222+
license,,`,"``Software''), to deal in the Software without restriction, including"
223+
license,,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
224224
reference/lexical_analysis,704,`,$ ? `
225225
whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
226226
whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"

‎Include/patchlevel.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
/*--start constants--*/
1919
#define PY_MAJOR_VERSION 3
2020
#define PY_MINOR_VERSION 2
21-
#define PY_MICRO_VERSION 1
21+
#define PY_MICRO_VERSION 2
2222
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
2323
#define PY_RELEASE_SERIAL 0
2424

2525
/* Version as a string */
26-
#define PY_VERSION "3.2.1+"
26+
#define PY_VERSION "3.2.2"
2727
/*--end constants--*/
2828

2929
/* Subversion Revision number of this file (not of the repository). Empty

‎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

7377
Footnotes:
7478

‎Lib/distutils/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# Updated automatically by the Python release process.
1414
#
1515
#--start constants--
16-
__version__ = "3.2.1"
16+
__version__ = "3.2.2"
1717
#--end constants--

‎Lib/idlelib/idlever.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
IDLE_VERSION = "3.2.1"
1+
IDLE_VERSION = "3.2.2"

0 commit comments

Comments
 (0)