[Python-checkins] cpython (merge 3.2 -> default): Issue: #12409: merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/a6bf08666da2
changeset:   74452:a6bf08666da2
parent:      74449:9935f7837c4b
parent:      74451:153e32333aaa
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Mon Jan 16 18:03:51 2012 +0100
summary:
  Issue: #12409: merge with 3.2

files:
  Doc/tools/sphinxext/susp-ignored.csv |  221 ---------------
  1 files changed, 0 insertions(+), 221 deletions(-)


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
@@ -164,128 +164,6 @@
 whatsnew/2.5,,:step,[start:stop:step]
 whatsnew/2.5,,:stop,[start:stop:step]
 distutils/examples,267,`,This is the description of the ``foobar`` package.
-documenting/fromlatex,39,:func,:func:`str(object)`
-documenting/fromlatex,39,`,:func:`str(object)`
-documenting/fromlatex,39,`,``str(object)``
-documenting/fromlatex,55,.. deprecated:,.. deprecated:: 2.5
-documenting/fromlatex,66,.. note:,.. note::
-documenting/fromlatex,76,:samp,":samp:`open({filename}, {mode})`"
-documenting/fromlatex,76,`,":samp:`open({filename}, {mode})`"
-documenting/fromlatex,80,`,``'c'``
-documenting/fromlatex,80,`,`Title <URL>`_
-documenting/fromlatex,80,`,``code``
-documenting/fromlatex,80,`,`Title <URL>`_
-documenting/fromlatex,99,:file,:file:`C:\\Temp\\my.tmp`
-documenting/fromlatex,99,`,:file:`C:\\Temp\\my.tmp`
-documenting/fromlatex,99,`,"``open(""C:\Temp\my.tmp"")``"
-documenting/fromlatex,129,.. function:,.. function:: do_foo(bar)
-documenting/fromlatex,141,.. function:,".. function:: open(filename[, mode[, buffering]])"
-documenting/fromlatex,152,.. function:,.. function:: foo_*
-documenting/fromlatex,152,:noindex,:noindex:
-documenting/fromlatex,162,.. describe:,.. describe:: a == b
-documenting/fromlatex,168,.. cmdoption:,.. cmdoption:: -O
-documenting/fromlatex,168,.. envvar:,.. envvar:: PYTHONINSPECT
-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:: Timer.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,233,:meth,:meth:
-documenting/markup,246,.. cmdoption:,.. cmdoption:: -m <module>
-documenting/markup,264,.. describe:,.. describe:: opcode
-documenting/markup,293,.. highlightlang:,.. highlightlang:: c
-documenting/markup,313,.. literalinclude:,.. literalinclude:: example.py
-documenting/markup,328,:rolename,:rolename:`content`
-documenting/markup,328,`,:rolename:`content`
-documenting/markup,333,:role,:role:`title <target>`
-documenting/markup,333,`,:role:`title <target>`
-documenting/markup,339,:meth,:meth:`~Queue.Queue.get`
-documenting/markup,339,`,:meth:`~Queue.Queue.get`
-documenting/markup,387,:func,:func:`filter`
-documenting/markup,387,`,:func:`filter`
-documenting/markup,387,:func,:func:`foo.filter`
-documenting/markup,387,`,:func:`foo.filter`
-documenting/markup,393,:func,:func:`open`
-documenting/markup,393,`,:func:`open`
-documenting/markup,393,:func,:func:`.open`
-documenting/markup,393,`,:func:`.open`
-documenting/markup,409,:data,c:data
-documenting/markup,413,:func,c:func
-documenting/markup,417,:macro,c:macro
-documenting/markup,421,:type,c:type
-documenting/markup,426,:member,c:member
-documenting/markup,476,:file,... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
-documenting/markup,476,`,... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
-documenting/markup,495,:kbd,:kbd:`C-x C-f`
-documenting/markup,495,`,:kbd:`C-x C-f`
-documenting/markup,495,:kbd,:kbd:`Control-x Control-f`
-documenting/markup,495,`,:kbd:`Control-x Control-f`
-documenting/markup,509,:mailheader,:mailheader:`Content-Type`
-documenting/markup,509,`,:mailheader:`Content-Type`
-documenting/markup,518,:manpage,:manpage:`ls(1)`
-documenting/markup,518,`,:manpage:`ls(1)`
-documenting/markup,534,:menuselection,:menuselection:`Start --> Programs`
-documenting/markup,534,`,:menuselection:`Start --> Programs`
-documenting/markup,549,`,``code``
-documenting/markup,567,:file,:file:
-documenting/markup,567,`,``code``
-documenting/markup,602,:ref,:ref:`label-name`
-documenting/markup,602,`,:ref:`label-name`
-documenting/markup,606,:ref,"It refers to the section itself, see :ref:`my-reference-label`."
-documenting/markup,606,`,"It refers to the section itself, see :ref:`my-reference-label`."
-documenting/markup,615,:ref,:ref:
-documenting/markup,636,.. note:,.. note::
-documenting/markup,663,.. versionadded:,.. versionadded:: 3.1
-documenting/markup,688,::,.. impl-detail::
-documenting/markup,688,::,.. impl-detail:: This shortly mentions an implementation detail.
-documenting/markup,708,.. seealso:,.. seealso::
-documenting/markup,708,:mod,Module :mod:`zipfile`
-documenting/markup,708,`,Module :mod:`zipfile`
-documenting/markup,708,:mod,Documentation of the :mod:`zipfile` standard module.
-documenting/markup,708,`,Documentation of the :mod:`zipfile` standard module.
-documenting/markup,708,`,"`GNU tar manual, Basic Tar Format <http://link>`_"
-documenting/markup,722,.. centered:,.. centered::
-documenting/markup,767,.. toctree:,.. toctree::
-documenting/markup,767,:maxdepth,:maxdepth: 2
-documenting/markup,783,.. index:,.. index::
-documenting/markup,813,.. index:,".. index:: BNF, grammar, syntax, notation"
-documenting/markup,844,`,"unaryneg ::= ""-"" `integer`"
-documenting/markup,849,.. productionlist:,.. productionlist::
-documenting/markup,849,`,"try1_stmt: ""try"" "":"" `suite`"
-documenting/markup,849,`,": (""except"" [`expression` ["","" `target`]] "":"" `suite`)+"
-documenting/markup,849,`,": [""else"" "":"" `suite`]"
-documenting/markup,849,`,": [""finally"" "":"" `suite`]"
-documenting/markup,849,`,"try2_stmt: ""try"" "":"" `suite`"
-documenting/markup,849,`,": ""finally"" "":"" `suite`"
-documenting/rest,33,`,``text``
-documenting/rest,47,:rolename,:rolename:`content`
-documenting/rest,47,`,:rolename:`content`
-documenting/rest,103,::,This is a normal text paragraph. The next paragraph is a code sample::
-documenting/rest,130,`,`Link text <http://target>`_
-documenting/rest,187,.. function:,.. function:: foo(x)
-documenting/rest,187,:bar,:bar: no
-documenting/rest,208,.. rubric:,.. rubric:: Footnotes
 faq/programming,,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
 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,,: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("
@@ -364,7 +242,6 @@
 howto/logging,,:logger,severity:logger name:message
 howto/logging,,:message,severity:logger name:message
 library/logging.handlers,,:port,host:port
-documenting/markup,613,`,:ref:`link text <reference-label>`
 library/imaplib,116,:MM,"""DD-Mmm-YYYY HH:MM:SS"
 library/imaplib,116,:SS,"""DD-Mmm-YYYY HH:MM:SS"
 whatsnew/3.2,,::,"$ export PYTHONWARNINGS='ignore::RuntimeWarning::,once::UnicodeWarning::'"
@@ -385,104 +262,6 @@
 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',"

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