Merge release branch after 3.2.1rc1.

birkenfeld · birkenfeld · commit 9c1928f0a90d · 2011-05-21T17:35:33.000+02:00
diff --git a/.hgtags b/.hgtags
@@ -86,3 +86,4 @@ acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2
 18c1f52896501c7ee13b038454a39acb45a87979 v3.2rc3
 a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
 8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1
+cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst
@@ -27,17 +27,15 @@ the same library that the Python runtime is using.
 
 .. c:function:: int Py_Main(int argc, wchar_t **argv)
 
-   The main program for the standard interpreter.  This is made
-   available for programs which embed Python.  The *argc* and *argv*
-   parameters should be prepared exactly as those which are passed to
-   a C program's :c:func:`main` function (converted to wchar_t
-   according to the user's locale).  It is important to note that the
-   argument list may be modified (but the contents of the strings
-   pointed to by the argument list are not). The return value will be
-   ```0``` if the interpreter exits normally (ie, without an
-   exception), ``1`` if the interpreter exits due to an exception, or
-   ``2`` if the parameter list does not represent a valid Python
-   command line.
+   The main program for the standard interpreter.  This is made available for
+   programs which embed Python.  The *argc* and *argv* parameters should be
+   prepared exactly as those which are passed to a C program's :c:func:`main`
+   function (converted to wchar_t according to the user's locale).  It is
+   important to note that the argument list may be modified (but the contents of
+   the strings pointed to by the argument list are not). The return value will
+   be ``0`` if the interpreter exits normally (i.e., without an exception),
+   ``1`` if the interpreter exits due to an exception, or ``2`` if the parameter
+   list does not represent a valid Python command line.
 
    Note that if an otherwise unhandled :exc:`SystemExit` is raised, this
    function will not return ``1``, but exit the process, as long as
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
@@ -391,3 +391,14 @@ documenting/markup,864,`,": [""else"" "":"" `suite`]"
 documenting/markup,864,`,": [""finally"" "":"" `suite`]"
 documenting/markup,864,`,"try2_stmt: ""try"" "":"" `suite`"
 documenting/markup,864,`,": ""finally"" "":"" `suite`"
+library/pprint,209,::,"'classifiers': ['Development Status :: 4 - Beta',"
+library/pprint,209,::,"'Intended Audience :: Developers',"
+library/pprint,209,::,"'License :: OSI Approved :: MIT License',"
+library/pprint,209,::,"'Natural Language :: English',"
+library/pprint,209,::,"'Operating System :: OS Independent',"
+library/pprint,209,::,"'Programming Language :: Python',"
+library/pprint,209,::,"'Programming Language :: Python :: 2',"
+library/pprint,209,::,"'Programming Language :: Python :: 2.6',"
+library/pprint,209,::,"'Programming Language :: Python :: 2.7',"
+library/pprint,209,::,"'Topic :: Software Development :: Libraries',"
+library/pprint,209,::,"'Topic :: Software Development :: Libraries :: Python Modules'],"
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	2
 #define PY_MICRO_VERSION	1
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_BETA
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
 #define PY_RELEASE_SERIAL	1
 
 /* Version as a string */
-#define PY_VERSION      	"3.2.1b1"
+#define PY_VERSION      	"3.2.1rc1"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.1b1"
+__version__ = "3.2.1rc1"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.2.1b1"
+IDLE_VERSION = "3.2.1rc1"
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -24,7 +24,7 @@ Library
 What's New in Python 3.2.1 release candidate 1?
 ===============================================
 
-*Release date: XX-XXX-2011*
+*Release date: 15-May-2011*
 
 Core and Builtins
 -----------------
diff --git a/Misc/RPM/python-3.2.spec b/Misc/RPM/python-3.2.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.2.1b1
+%define version 3.2.1rc1
 %define libvers 3.2
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
@@ -1,5 +1,5 @@
-This is Python version 3.2.1 beta 1
-===================================
+This is Python version 3.2.1 release candidate 1
+================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 Python Software Foundation.  All rights reserved.
diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
@@ -87,4 +87,6 @@
     '3.2.122' :'{4f3edfa6-cf70-469a-825f-e1206aa7f412}', # 3.2rc2
     '3.2.123' :'{90c673d7-8cfd-4969-9816-f7d70bad87f3}', # 3.2rc3
     '3.2.150' :'{b2042d5e-986d-44ec-aee3-afe4108ccc93}', # 3.2.0
+    '3.2.1121':'{4f90de4a-83dd-4443-b625-ca130ff361dd}', # 3.2.1rc1
+    '3.2.1150':'{34b2530c-6349-4292-9dc3-60bda4aed93c}', # 3.2.1
 }

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@`
`15`	`15`	`# Updated automatically by the Python release process.`
`16`	`16`	`#`
`17`	`17`	`#--start constants--`
`18`		`-__version__ = "3.2.1b1"`
	`18`	`+__version__ = "3.2.1rc1"`
`19`	`19`	`#--end constants--`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-IDLE_VERSION = "3.2.1b1"`
	`1`	`+IDLE_VERSION = "3.2.1rc1"`