Skip to content

Commit

Permalink
GH-97850: Suppress cross-references to removed importlib.util fun…
Browse files Browse the repository at this point in the history
…ctions (#104134)

`importlib.utils` -> `importlib.util` in a few places

---------

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
  • Loading branch information
AA-Turner and AlexWaygood committed May 3, 2023
1 parent 8b03e5f commit 423d7fa
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Doc/whatsnew/3.10.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1683,9 +1683,9 @@ Deprecated
(Contributed by Brett Cannon in :issue:`42135`.)
* The deprecations of :mod:`!imp`, :func:`!importlib.find_loader`,
:func:`importlib.util.set_package_wrapper`,
:func:`importlib.util.set_loader_wrapper`,
:func:`importlib.util.module_for_loader`,
:func:`!importlib.util.set_package_wrapper`,
:func:`!importlib.util.set_loader_wrapper`,
:func:`!importlib.util.module_for_loader`,
:class:`!pkgutil.ImpImporter`, and
:class:`!pkgutil.ImpLoader` have all been updated to list Python 3.12 as the
slated version of removal (they began raising :exc:`DeprecationWarning` in
Expand Down
2 changes: 1 addition & 1 deletion Doc/whatsnew/3.11.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1889,7 +1889,7 @@ C APIs pending removal are
* :meth:`!importlib.machinery.FrozenLoader.module_repr`
* :meth:`!importlib.machinery.PathFinder.find_module`
* :meth:`!importlib.machinery.WindowsRegistryFinder.find_module`
* :func:`importlib.util.module_for_loader`
* :func:`!importlib.util.module_for_loader`
* :func:`!importlib.util.set_loader_wrapper`
* :func:`!importlib.util.set_package_wrapper`
* :class:`!pkgutil.ImpImporter`
Expand Down
6 changes: 3 additions & 3 deletions Doc/whatsnew/3.4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2097,8 +2097,8 @@ Deprecations in the Python API
:meth:`importlib.abc.SourceLoader.exec_module`) and let the import system
take care of the rest; and
:meth:`!importlib.abc.Loader.module_repr`,
:meth:`importlib.util.module_for_loader`, :meth:`importlib.util.set_loader`,
and :meth:`importlib.util.set_package` are no longer needed because their
:meth:`!importlib.util.module_for_loader`, :meth:`!importlib.util.set_loader`,
and :meth:`!importlib.util.set_package` are no longer needed because their
functions are now handled automatically by the import system.

* The :mod:`!imp` module is pending deprecation. To keep compatibility with
Expand Down Expand Up @@ -2277,7 +2277,7 @@ Changes in the Python API
in a backwards-compatible fashion, use e.g.
``getattr(module, '__loader__', None) is not None``. (:issue:`17115`.)

* :meth:`importlib.util.module_for_loader` now sets ``__loader__`` and
* :meth:`!importlib.util.module_for_loader` now sets ``__loader__`` and
``__package__`` unconditionally to properly support reloading. If this is not
desired then you will need to set these attributes manually. You can use
:func:`importlib.util.module_to_load` for module management.
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/3.10.0a5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ Araujo.
.. nonce: HY2beA
.. section: Documentation
Updated importlib.utils.resolve_name() doc to use __spec__.parent instead of
Updated importlib.util.resolve_name() doc to use __spec__.parent instead of
__package__. (Thanks Yair Frid.)

..
Expand Down
4 changes: 2 additions & 2 deletions Misc/NEWS.d/3.12.0a1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2028,8 +2028,8 @@ resources.
.. nonce: NzdREm
.. section: Library
Remove deprecated :func:`importlib.utils.set_loader` and
:func:`importlib.utils.module_for_loader` from :mod:`importlib.utils`.
Remove deprecated :func:`!importlib.util.set_loader` and
:func:`!importlib.util.module_for_loader` from :mod:`importlib.util`.

..
Expand Down

0 comments on commit 423d7fa

Please sign in to comment.