Commit df48b978 authored by Georg Brandl's avatar Georg Brandl

Fix a few scoping issues with versionadded/versionchanged directives.

parent 645d3b76
...@@ -247,7 +247,7 @@ in various ways. There is a separate error indicator for each thread. ...@@ -247,7 +247,7 @@ in various ways. There is a separate error indicator for each thread.
filename object, for raising errors when a function that takes two filenames filename object, for raising errors when a function that takes two filenames
fails. fails.
.. versionadded:: 3.4 .. versionadded:: 3.4
.. c:function:: PyObject* PyErr_SetFromErrnoWithFilename(PyObject *type, const char *filename) .. c:function:: PyObject* PyErr_SetFromErrnoWithFilename(PyObject *type, const char *filename)
...@@ -295,7 +295,7 @@ in various ways. There is a separate error indicator for each thread. ...@@ -295,7 +295,7 @@ in various ways. There is a separate error indicator for each thread.
but accepts a second filename object. but accepts a second filename object.
Availability: Windows. Availability: Windows.
.. versionadded:: 3.4 .. versionadded:: 3.4
.. c:function:: PyObject* PyErr_SetExcFromWindowsErrWithFilename(PyObject *type, int ierr, const char *filename) .. c:function:: PyObject* PyErr_SetExcFromWindowsErrWithFilename(PyObject *type, int ierr, const char *filename)
...@@ -321,7 +321,7 @@ in various ways. There is a separate error indicator for each thread. ...@@ -321,7 +321,7 @@ in various ways. There is a separate error indicator for each thread.
attributes, which make the exception printing subsystem think the exception attributes, which make the exception printing subsystem think the exception
is a :exc:`SyntaxError`. is a :exc:`SyntaxError`.
.. versionadded:: 3.4 .. versionadded:: 3.4
.. c:function:: void PyErr_SyntaxLocationEx(char *filename, int lineno, int col_offset) .. c:function:: void PyErr_SyntaxLocationEx(char *filename, int lineno, int col_offset)
...@@ -329,7 +329,7 @@ in various ways. There is a separate error indicator for each thread. ...@@ -329,7 +329,7 @@ in various ways. There is a separate error indicator for each thread.
Like :c:func:`PyErr_SyntaxLocationObject`, but *filename* is a byte string Like :c:func:`PyErr_SyntaxLocationObject`, but *filename* is a byte string
decoded from the filesystem encoding (:func:`os.fsdecode`). decoded from the filesystem encoding (:func:`os.fsdecode`).
.. versionadded:: 3.2 .. versionadded:: 3.2
.. c:function:: void PyErr_SyntaxLocation(char *filename, int lineno) .. c:function:: void PyErr_SyntaxLocation(char *filename, int lineno)
......
...@@ -364,6 +364,7 @@ attribute is considered sufficient for this determination. ...@@ -364,6 +364,7 @@ attribute is considered sufficient for this determination.
.. versionadded:: 3.4 .. versionadded:: 3.4
.. c:function:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key) .. c:function:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key)
Return element of *o* corresponding to the object *key* or *NULL* on failure. Return element of *o* corresponding to the object *key* or *NULL* on failure.
......
...@@ -502,7 +502,8 @@ or'ed together and passed to various functions. The names can also be used in ...@@ -502,7 +502,8 @@ or'ed together and passed to various functions. The names can also be used in
:ref:`doctest directives <doctest-directives>`, and may be passed to the :ref:`doctest directives <doctest-directives>`, and may be passed to the
doctest command line interface via the ``-o`` option. doctest command line interface via the ``-o`` option.
.. versionadded:: 3.4 the ``-o`` command line option .. versionadded:: 3.4
The ``-o`` command line option.
The first group of options define test semantics, controlling aspects of how The first group of options define test semantics, controlling aspects of how
doctest decides whether actual output matches an example's expected output: doctest decides whether actual output matches an example's expected output:
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
.. module:: faulthandler .. module:: faulthandler
:synopsis: Dump the Python traceback. :synopsis: Dump the Python traceback.
.. versionadded:: 3.3
This module contains functions to dump Python tracebacks explicitly, on a fault, This module contains functions to dump Python tracebacks explicitly, on a fault,
after a timeout, or on a user signal. Call :func:`faulthandler.enable` to after a timeout, or on a user signal. Call :func:`faulthandler.enable` to
install fault handlers for the :const:`SIGSEGV`, :const:`SIGFPE`, install fault handlers for the :const:`SIGSEGV`, :const:`SIGFPE`,
...@@ -36,8 +38,6 @@ alternatively be passed to :func:`faulthandler.enable`. ...@@ -36,8 +38,6 @@ alternatively be passed to :func:`faulthandler.enable`.
The module is implemented in C, so tracebacks can be dumped on a crash or when The module is implemented in C, so tracebacks can be dumped on a crash or when
Python is deadlocked. Python is deadlocked.
.. versionadded:: 3.3
Dump the traceback Dump the traceback
------------------ ------------------
......
...@@ -832,6 +832,7 @@ are always available. They are listed here in alphabetical order. ...@@ -832,6 +832,7 @@ are always available. They are listed here in alphabetical order.
.. versionadded:: 3.4 .. versionadded:: 3.4
The *default* keyword-only argument. The *default* keyword-only argument.
.. function:: next(iterator[, default]) .. function:: next(iterator[, default])
Retrieve the next item from the *iterator* by calling its Retrieve the next item from the *iterator* by calling its
......
...@@ -451,6 +451,7 @@ An :class:`IMAP4` instance has the following methods: ...@@ -451,6 +451,7 @@ An :class:`IMAP4` instance has the following methods:
:attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see :attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
:data:`ssl.HAS_SNI`). :data:`ssl.HAS_SNI`).
.. method:: IMAP4.status(mailbox, names) .. method:: IMAP4.status(mailbox, names)
Request named status conditions for *mailbox*. Request named status conditions for *mailbox*.
......
...@@ -262,12 +262,12 @@ that circular imports work without any deadlocks. ...@@ -262,12 +262,12 @@ that circular imports work without any deadlocks.
exception is made for circular imports, which by construction have to exception is made for circular imports, which by construction have to
expose an incomplete module object at some point. expose an incomplete module object at some point.
.. versionchanged:: 3.3 .. versionchanged:: 3.3
The locking scheme has changed to per-module locks for The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks, the most part. A global import lock is kept for some critical tasks,
such as initializing the per-module locks. such as initializing the per-module locks.
.. deprecated:: 3.4 .. deprecated:: 3.4
.. function:: acquire_lock() .. function:: acquire_lock()
...@@ -282,12 +282,12 @@ that circular imports work without any deadlocks. ...@@ -282,12 +282,12 @@ that circular imports work without any deadlocks.
On platforms without threads, this function does nothing. On platforms without threads, this function does nothing.
.. versionchanged:: 3.3 .. versionchanged:: 3.3
The locking scheme has changed to per-module locks for The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks, the most part. A global import lock is kept for some critical tasks,
such as initializing the per-module locks. such as initializing the per-module locks.
.. deprecated:: 3.4 .. deprecated:: 3.4
.. function:: release_lock() .. function:: release_lock()
...@@ -295,12 +295,12 @@ that circular imports work without any deadlocks. ...@@ -295,12 +295,12 @@ that circular imports work without any deadlocks.
Release the interpreter's global import lock. On platforms without Release the interpreter's global import lock. On platforms without
threads, this function does nothing. threads, this function does nothing.
.. versionchanged:: 3.3 .. versionchanged:: 3.3
The locking scheme has changed to per-module locks for The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks, the most part. A global import lock is kept for some critical tasks,
such as initializing the per-module locks. such as initializing the per-module locks.
.. deprecated:: 3.4 .. deprecated:: 3.4
The following constants with integer values, defined in this module, are used The following constants with integer values, defined in this module, are used
......
...@@ -626,8 +626,8 @@ ABC hierarchy:: ...@@ -626,8 +626,8 @@ ABC hierarchy::
have to implement it, but it is still available for compatibility have to implement it, but it is still available for compatibility
purposes. Raise :exc:`IOError` if the path cannot be handled. purposes. Raise :exc:`IOError` if the path cannot be handled.
.. versionchanged:: 3.4 .. versionchanged:: 3.4
Raise :exc:`IOError` instead of :exc:`NotImplementedError`. Raise :exc:`IOError` instead of :exc:`NotImplementedError`.
.. method:: set_data(path, data) .. method:: set_data(path, data)
......
...@@ -138,9 +138,9 @@ to start a process. These *start methods* are ...@@ -138,9 +138,9 @@ to start a process. These *start methods* are
.. versionchanged:: 3.4 .. versionchanged:: 3.4
*spawn* added on all unix platforms, and *forkserver* added for *spawn* added on all unix platforms, and *forkserver* added for
some unix platforms. some unix platforms.
Child processes no longer inherit all of the parents inheritable Child processes no longer inherit all of the parents inheritable
handles on Windows. handles on Windows.
On Unix using the *spawn* or *forkserver* start methods will also On Unix using the *spawn* or *forkserver* start methods will also
start a *semaphore tracker* process which tracks the unlinked named start a *semaphore tracker* process which tracks the unlinked named
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
.. sectionauthor:: Greg Ward <gward@python.net> .. sectionauthor:: Greg Ward <gward@python.net>
.. deprecated:: 3.2 .. deprecated:: 3.2
The :mod:`optparse` module is deprecated and will not be developed further; The :mod:`optparse` module is deprecated and will not be developed further;
development will continue with the :mod:`argparse` module. development will continue with the :mod:`argparse` module.
**Source code:** :source:`Lib/optparse.py` **Source code:** :source:`Lib/optparse.py`
......
...@@ -12,11 +12,12 @@ always available. ...@@ -12,11 +12,12 @@ always available.
.. data:: abiflags .. data:: abiflags
On POSIX systems where Python is build with the standard ``configure`` On POSIX systems where Python was built with the standard ``configure``
script, this contains the ABI flags as specified by :pep:`3149`. script, this contains the ABI flags as specified by :pep:`3149`.
.. versionadded:: 3.2 .. versionadded:: 3.2
.. data:: argv .. data:: argv
The list of command line arguments passed to a Python script. ``argv[0]`` is the The list of command line arguments passed to a Python script. ``argv[0]`` is the
......
...@@ -523,9 +523,10 @@ request. ...@@ -523,9 +523,10 @@ request.
Return a list of tuples (header_name, header_value) of the Request headers. Return a list of tuples (header_name, header_value) of the Request headers.
.. versionchanged:: 3.4 .. versionchanged:: 3.4
Request methods add_data, has_data, get_data, get_type, get_host, The request methods add_data, has_data, get_data, get_type, get_host,
get_selector, get_origin_req_host and is_unverifiable deprecated since 3.3 get_selector, get_origin_req_host and is_unverifiable that were deprecated
have been removed. since 3.3 have been removed.
.. _opener-director-objects: .. _opener-director-objects:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment