[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2.1rc1 release changes to default.

[georg.brandl]

http://hg.python.org/cpython/rev/af715726d911
changeset:   70258:af715726d911
parent:      70256:a1f2a6e0a978
parent:      70255:0f4fc0d1fe53
user:        Georg Brandl <georg at python.org>
date:        Sat May 21 19:43:36 2011 +0200
summary:
  Merge 3.2.1rc1 release changes to default.

files:
  .hgtags                              |    1 +
  Doc/c-api/veryhigh.rst               |   20 +-
  Doc/tools/sphinxext/susp-ignored.csv |  109 +++++++++++++++
  Tools/msi/uuids.py                   |    2 +
  4 files changed, 121 insertions(+), 11 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -86,3 +86,4 @@
 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
--- a/Doc/c-api/veryhigh.rst
+++ b/Doc/c-api/veryhigh.rst
@@ -27,17 +27,15 @@
 
 .. 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
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -386,3 +386,112 @@
 whatsnew/3.2,,:affe,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
 whatsnew/3.2,,:deaf,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
 whatsnew/3.2,,:feed,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
+documenting/markup,33,.. sectionauthor:,.. sectionauthor:: Guido van Rossum <guido at python.org>
+documenting/markup,42,:mod,:mod:`parrot` -- Dead parrot access
+documenting/markup,42,`,:mod:`parrot` -- Dead parrot access
+documenting/markup,42,.. module:,.. module:: parrot
+documenting/markup,42,:platform,":platform: Unix, Windows"
+documenting/markup,42,:synopsis,:synopsis: Analyze and reanimate dead parrots.
+documenting/markup,42,.. moduleauthor:,.. moduleauthor:: Eric Cleese <eric at python.invalid>
+documenting/markup,42,.. moduleauthor:,.. moduleauthor:: John Idle <john at python.invalid>
+documenting/markup,88,:noindex,:noindex:
+documenting/markup,95,.. function:,.. function:: spam(eggs)
+documenting/markup,95,:noindex,:noindex:
+documenting/markup,101,.. method:,.. method:: FileInput.input(...)
+documenting/markup,121,:function,c:function
+documenting/markup,121,.. c:,".. c:function:: PyObject* PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)"
+documenting/markup,121,::,".. c:function:: PyObject* PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)"
+documenting/markup,131,:member,c:member
+documenting/markup,131,.. c:,.. c:member:: PyObject* PyTypeObject.tp_bases
+documenting/markup,131,::,.. c:member:: PyObject* PyTypeObject.tp_bases
+documenting/markup,139,:macro,c:macro
+documenting/markup,143,:type,c:type
+documenting/markup,150,:var,c:var
+documenting/markup,150,.. cvar:,.. cvar:: PyObject* PyClass_Type
+documenting/markup,179,.. function:,".. function:: repeat([repeat=3[, number=1000000]])"
+documenting/markup,210,.. decorator:,.. decorator:: removename
+documenting/markup,210,.. decorator:,.. decorator:: setnewname(name)
+documenting/markup,210,:func,:func:
+documenting/markup,237,.. class:,.. class:: Spam
+documenting/markup,237,.. data:,.. data:: ham
+documenting/markup,237,.. data:,.. data:: Spam.eggs
+documenting/markup,250,:meth,:meth:
+documenting/markup,263,.. cmdoption:,.. cmdoption:: -m <module>
+documenting/markup,281,.. describe:,.. describe:: opcode
+documenting/markup,310,.. highlightlang:,.. highlightlang:: c
+documenting/markup,330,.. literalinclude:,.. literalinclude:: example.py
+documenting/markup,345,:rolename,:rolename:`content`
+documenting/markup,345,`,:rolename:`content`
+documenting/markup,350,:role,:role:`title <target>`
+documenting/markup,350,`,:role:`title <target>`
+documenting/markup,356,:meth,:meth:`~Queue.Queue.get`
+documenting/markup,356,`,:meth:`~Queue.Queue.get`
+documenting/markup,404,:func,:func:`filter`
+documenting/markup,404,`,:func:`filter`
+documenting/markup,404,:func,:func:`foo.filter`
+documenting/markup,404,`,:func:`foo.filter`
+documenting/markup,410,:func,:func:`open`
+documenting/markup,410,`,:func:`open`
+documenting/markup,410,:func,:func:`.open`
+documenting/markup,410,`,:func:`.open`
+documenting/markup,426,:data,c:data
+documenting/markup,430,:func,c:func
+documenting/markup,434,:macro,c:macro
+documenting/markup,438,:type,c:type
+documenting/markup,443,:member,c:member
+documenting/markup,493,:file,... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
+documenting/markup,493,`,... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
+documenting/markup,512,:kbd,:kbd:`C-x C-f`
+documenting/markup,512,`,:kbd:`C-x C-f`
+documenting/markup,512,:kbd,:kbd:`Control-x Control-f`
+documenting/markup,512,`,:kbd:`Control-x Control-f`
+documenting/markup,526,:mailheader,:mailheader:`Content-Type`
+documenting/markup,526,`,:mailheader:`Content-Type`
+documenting/markup,535,:manpage,:manpage:`ls(1)`
+documenting/markup,535,`,:manpage:`ls(1)`
+documenting/markup,551,:menuselection,:menuselection:`Start --> Programs`
+documenting/markup,551,`,:menuselection:`Start --> Programs`
+documenting/markup,566,`,``code``
+documenting/markup,585,:file,:file:
+documenting/markup,585,`,``code``
+documenting/markup,615,:ref,:ref:`label-name`
+documenting/markup,615,`,:ref:`label-name`
+documenting/markup,619,:ref,"It refers to the section itself, see :ref:`my-reference-label`."
+documenting/markup,619,`,"It refers to the section itself, see :ref:`my-reference-label`."
+documenting/markup,628,:ref,:ref:
+documenting/markup,630,:ref,:ref:`link text <reference-label>`
+documenting/markup,630,`,:ref:`link text <reference-label>`
+documenting/markup,651,.. note:,.. note::
+documenting/markup,678,.. versionadded:,.. versionadded:: 3.1
+documenting/markup,703,::,.. impl-detail::
+documenting/markup,703,::,.. impl-detail:: This shortly mentions an implementation detail.
+documenting/markup,723,.. seealso:,.. seealso::
+documenting/markup,723,:mod,Module :mod:`zipfile`
+documenting/markup,723,`,Module :mod:`zipfile`
+documenting/markup,723,:mod,Documentation of the :mod:`zipfile` standard module.
+documenting/markup,723,`,Documentation of the :mod:`zipfile` standard module.
+documenting/markup,723,`,"`GNU tar manual, Basic Tar Format <http://link>`_"
+documenting/markup,737,.. centered:,.. centered::
+documenting/markup,782,.. toctree:,.. toctree::
+documenting/markup,782,:maxdepth,:maxdepth: 2
+documenting/markup,798,.. index:,.. index::
+documenting/markup,828,.. index:,".. index:: BNF, grammar, syntax, notation"
+documenting/markup,859,`,"unaryneg ::= ""-"" `integer`"
+documenting/markup,864,.. productionlist:,.. productionlist::
+documenting/markup,864,`,"try1_stmt: ""try"" "":"" `suite`"
+documenting/markup,864,`,": (""except"" [`expression` ["","" `target`]] "":"" `suite`)+"
+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/Tools/msi/uuids.py b/Tools/msi/uuids.py
--- 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
 }

-- 
Repository URL: http://hg.python.org/cpython