Use deprecated-removed directive, clean up a few markup issues around

deprecated directives.
This commit is contained in:
Georg Brandl 2014-03-24 08:42:37 +01:00
parent 14017b2a53
commit 29636aeacc
6 changed files with 23 additions and 23 deletions

View File

@ -5,7 +5,7 @@
:synopsis: Generic output formatter and device interface.
:deprecated:
.. deprecated:: 3.4
.. deprecated-removed:: 3.4 3.6
Due to lack of usage, the formatter module has been deprecated and is slated
for removal in Python 3.6.

View File

@ -262,12 +262,12 @@ that circular imports work without any deadlocks.
exception is made for circular imports, which by construction have to
expose an incomplete module object at some point.
.. versionchanged:: 3.3
The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks,
such as initializing the per-module locks.
.. versionchanged:: 3.3
The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks,
such as initializing the per-module locks.
.. deprecated:: 3.4
.. deprecated:: 3.4
.. function:: acquire_lock()
@ -282,12 +282,12 @@ that circular imports work without any deadlocks.
On platforms without threads, this function does nothing.
.. versionchanged:: 3.3
The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks,
such as initializing the per-module locks.
.. versionchanged:: 3.3
The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks,
such as initializing the per-module locks.
.. deprecated:: 3.4
.. deprecated:: 3.4
.. function:: release_lock()
@ -295,12 +295,12 @@ that circular imports work without any deadlocks.
Release the interpreter's global import lock. On platforms without
threads, this function does nothing.
.. versionchanged:: 3.3
The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks,
such as initializing the per-module locks.
.. versionchanged:: 3.3
The locking scheme has changed to per-module locks for
the most part. A global import lock is kept for some critical tasks,
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

View File

@ -626,8 +626,8 @@ ABC hierarchy::
have to implement it, but it is still available for compatibility
purposes. Raise :exc:`IOError` if the path cannot be handled.
.. versionchanged:: 3.4
Raise :exc:`IOError` instead of :exc:`NotImplementedError`.
.. versionchanged:: 3.4
Raise :exc:`IOError` instead of :exc:`NotImplementedError`.
.. method:: set_data(path, data)

View File

@ -8,8 +8,8 @@
.. sectionauthor:: Greg Ward <gward@python.net>
.. deprecated:: 3.2
The :mod:`optparse` module is deprecated and will not be developed further;
development will continue with the :mod:`argparse` module.
The :mod:`optparse` module is deprecated and will not be developed further;
development will continue with the :mod:`argparse` module.
**Source code:** :source:`Lib/optparse.py`

View File

@ -58,7 +58,7 @@ support.
.. deprecated:: 3.3
This emulation is no longer needed, as the standard import mechanism
is now fully PEP 302 compliant and available in :mod:`importlib`
is now fully PEP 302 compliant and available in :mod:`importlib`.
.. class:: ImpLoader(fullname, file, filename, etc)
@ -67,7 +67,7 @@ support.
.. deprecated:: 3.3
This emulation is no longer needed, as the standard import mechanism
is now fully PEP 302 compliant and available in :mod:`importlib`
is now fully PEP 302 compliant and available in :mod:`importlib`.
.. function:: find_loader(fullname)

View File

@ -38,7 +38,7 @@ Unix and Macintosh). For each of the distinct head-tail combinations, it sees
if it refers to an existing directory, and if so, adds it to ``sys.path`` and
also inspects the newly added path for configuration files.
.. deprecated:: 3.4
.. deprecated-removed:: 3.4 3.5
Support for the "site-python" directory will be removed in 3.5.
If a file named "pyvenv.cfg" exists one directory above sys.executable,