summaryrefslogtreecommitdiff
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-03-26 18:26:52 -0700
committerGitHub <noreply@github.com>2019-03-26 18:26:52 -0700
commitead15795986972690217e52087eb946b8a5bbcda (patch)
tree3fa294b396be126f9904d1b08d93fca276bd04d7 /Doc/glossary.rst
parente16599c48ce3b99e4c3aaf0cb053cd01b50e380f (diff)
downloadcpython-git-ead15795986972690217e52087eb946b8a5bbcda.tar.gz
bpo-33832: Add "magic method" glossary entry (GH-7630)
(cherry picked from commit f760610bddd7e8f8ac0914d5d59ef806bc16a73b) Co-authored-by: Andre Delfino <adelfino@gmail.com>
Diffstat (limited to 'Doc/glossary.rst')
-rw-r--r--Doc/glossary.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index fb8ff2a7c6..472351b485 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -659,6 +659,11 @@ Glossary
:term:`finder`. See :pep:`302` for details and
:class:`importlib.abc.Loader` for an :term:`abstract base class`.
+ magic method
+ .. index:: pair: magic; method
+
+ An informal synonym for :term:`special method`.
+
mapping
A container object that supports arbitrary key lookups and implements the
methods specified in the :class:`~collections.abc.Mapping` or
@@ -1000,6 +1005,8 @@ Glossary
(subscript) notation uses :class:`slice` objects internally.
special method
+ .. index:: pair: special; method
+
A method that is called implicitly by Python to execute a certain
operation on a type, such as addition. Such methods have names starting
and ending with double underscores. Special methods are documented in