From 5bc0e57310757d74c79276e4fbb217f7be8ad329 Mon Sep 17 00:00:00 2001 From: nikalinov <92603661+nikalinov@users.noreply.github.com> Date: Mon, 20 Jan 2025 15:46:09 +0000 Subject: [PATCH 1/3] gh-129044: Update glossary entry for 'loader' to reflect current import system (#129073) Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> (cherry picked from commit e1fa2fcc7c1bf5291a7f71300b7828b49be9ab72) Backport of gh-129044 to 3.12 --- Doc/glossary.rst | 8 +++++--- Doc/tools/.nitignore | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 50ed5fc2bc096c..be8201ef41941f 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -748,9 +748,11 @@ Glossary processed. loader - An object that loads a module. It must define a method named - :meth:`load_module`. A loader is typically returned by a - :term:`finder`. See also: + An object that loads a module. + It must define the :meth:`!exec_module` and :meth:`!create_module` methods + to implement the :class:`~importlib.abc.Loader` interface. + A loader is typically returned by a :term:`finder`. + See also: * :ref:`finders-and-loaders` * :class:`importlib.abc.Loader` diff --git a/Doc/tools/.nitignore b/Doc/tools/.nitignore index a721b494d750eb..abbfa2fc8d3ac4 100644 --- a/Doc/tools/.nitignore +++ b/Doc/tools/.nitignore @@ -13,12 +13,15 @@ Doc/c-api/stable.rst Doc/c-api/type.rst Doc/c-api/typeobj.rst Doc/extending/extending.rst -Doc/glossary.rst +<<<<<<< HEAD Doc/library/2to3.rst Doc/library/aifc.rst +======= +>>>>>>> e1fa2fcc7c (gh-129044: Update glossary entry for 'loader' to reflect current import system (#129073)) Doc/library/ast.rst Doc/library/asyncio-extending.rst Doc/library/asyncio-policy.rst +Doc/library/asyncio-policy.rst Doc/library/asyncio-subprocess.rst Doc/library/audioop.rst Doc/library/cgi.rst From 8b35e33abc62d7342a4c200bc7d259bbe676d250 Mon Sep 17 00:00:00 2001 From: nikalinov Date: Tue, 21 Jan 2025 11:02:26 +0000 Subject: [PATCH 2/3] Remove text from .nitignore --- Doc/tools/.nitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/Doc/tools/.nitignore b/Doc/tools/.nitignore index abbfa2fc8d3ac4..c8994ac6d71eac 100644 --- a/Doc/tools/.nitignore +++ b/Doc/tools/.nitignore @@ -13,11 +13,8 @@ Doc/c-api/stable.rst Doc/c-api/type.rst Doc/c-api/typeobj.rst Doc/extending/extending.rst -<<<<<<< HEAD Doc/library/2to3.rst Doc/library/aifc.rst -======= ->>>>>>> e1fa2fcc7c (gh-129044: Update glossary entry for 'loader' to reflect current import system (#129073)) Doc/library/ast.rst Doc/library/asyncio-extending.rst Doc/library/asyncio-policy.rst From 31a5593bdb3285f897989ab1bba777468be5dc1a Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:43:01 +0000 Subject: [PATCH 3/3] Update Doc/tools/.nitignore --- Doc/tools/.nitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Doc/tools/.nitignore b/Doc/tools/.nitignore index c8994ac6d71eac..325b149019d7da 100644 --- a/Doc/tools/.nitignore +++ b/Doc/tools/.nitignore @@ -18,7 +18,6 @@ Doc/library/aifc.rst Doc/library/ast.rst Doc/library/asyncio-extending.rst Doc/library/asyncio-policy.rst -Doc/library/asyncio-policy.rst Doc/library/asyncio-subprocess.rst Doc/library/audioop.rst Doc/library/cgi.rst