Sitelet https://github.com/python/cpython/commit/29636aeaccaf6a1412e0dc7c230db29cccf68381
Skip to content

Commit 29636ae

Browse files
birkenfeldbirkenfeld
committed
Use deprecated-removed directive, clean up a few markup issues around
deprecated directives.
1 parent 14017b2 commit 29636ae

6 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎Doc/library/formatter.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:synopsis: Generic output formatter and device interface.
66
:deprecated:
77

8-
.. deprecated:: 3.4
8+
.. deprecated-removed:: 3.4 3.6
99
Due to lack of usage, the formatter module has been deprecated and is slated
1010
for removal in Python 3.6.
1111

‎Doc/library/imp.rst‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,12 @@ that circular imports work without any deadlocks.
262262
exception is made for circular imports, which by construction have to
263263
expose an incomplete module object at some point.
264264

265-
.. versionchanged:: 3.3
266-
The locking scheme has changed to per-module locks for
267-
the most part. A global import lock is kept for some critical tasks,
268-
such as initializing the per-module locks.
265+
.. versionchanged:: 3.3
266+
The locking scheme has changed to per-module locks for
267+
the most part. A global import lock is kept for some critical tasks,
268+
such as initializing the per-module locks.
269269

270-
.. deprecated:: 3.4
270+
.. deprecated:: 3.4
271271

272272

273273
.. function:: acquire_lock()
@@ -282,25 +282,25 @@ that circular imports work without any deadlocks.
282282

283283
On platforms without threads, this function does nothing.
284284

285-
.. versionchanged:: 3.3
286-
The locking scheme has changed to per-module locks for
287-
the most part. A global import lock is kept for some critical tasks,
288-
such as initializing the per-module locks.
285+
.. versionchanged:: 3.3
286+
The locking scheme has changed to per-module locks for
287+
the most part. A global import lock is kept for some critical tasks,
288+
such as initializing the per-module locks.
289289

290-
.. deprecated:: 3.4
290+
.. deprecated:: 3.4
291291

292292

293293
.. function:: release_lock()
294294

295295
Release the interpreter's global import lock. On platforms without
296296
threads, this function does nothing.
297297

298-
.. versionchanged:: 3.3
299-
The locking scheme has changed to per-module locks for
300-
the most part. A global import lock is kept for some critical tasks,
301-
such as initializing the per-module locks.
298+
.. versionchanged:: 3.3
299+
The locking scheme has changed to per-module locks for
300+
the most part. A global import lock is kept for some critical tasks,
301+
such as initializing the per-module locks.
302302

303-
.. deprecated:: 3.4
303+
.. deprecated:: 3.4
304304

305305

306306
The following constants with integer values, defined in this module, are used

‎Doc/library/importlib.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,8 @@ ABC hierarchy::
626626
have to implement it, but it is still available for compatibility
627627
purposes. Raise :exc:`IOError` if the path cannot be handled.
628628

629-
.. versionchanged:: 3.4
630-
Raise :exc:`IOError` instead of :exc:`NotImplementedError`.
629+
.. versionchanged:: 3.4
630+
Raise :exc:`IOError` instead of :exc:`NotImplementedError`.
631631

632632
.. method:: set_data(path, data)
633633

‎Doc/library/optparse.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
.. sectionauthor:: Greg Ward <gward@python.net>
99

1010
.. deprecated:: 3.2
11-
The :mod:`optparse` module is deprecated and will not be developed further;
12-
development will continue with the :mod:`argparse` module.
11+
The :mod:`optparse` module is deprecated and will not be developed further;
12+
development will continue with the :mod:`argparse` module.
1313

1414
**Source code:** :source:`Lib/optparse.py`
1515

‎Doc/library/pkgutil.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ support.
5858

5959
.. deprecated:: 3.3
6060
This emulation is no longer needed, as the standard import mechanism
61-
is now fully PEP 302 compliant and available in :mod:`importlib`
61+
is now fully PEP 302 compliant and available in :mod:`importlib`.
6262

6363

6464
.. class:: ImpLoader(fullname, file, filename, etc)
@@ -67,7 +67,7 @@ support.
6767

6868
.. deprecated:: 3.3
6969
This emulation is no longer needed, as the standard import mechanism
70-
is now fully PEP 302 compliant and available in :mod:`importlib`
70+
is now fully PEP 302 compliant and available in :mod:`importlib`.
7171

7272

7373
.. function:: find_loader(fullname)

‎Doc/library/site.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Unix and Macintosh). For each of the distinct head-tail combinations, it sees
3838
if it refers to an existing directory, and if so, adds it to ``sys.path`` and
3939
also inspects the newly added path for configuration files.
4040

41-
.. deprecated:: 3.4
41+
.. deprecated-removed:: 3.4 3.5
4242
Support for the "site-python" directory will be removed in 3.5.
4343

4444
If a file named "pyvenv.cfg" exists one directory above sys.executable,

0 commit comments

Comments
 (0)