summaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-03-26 18:26:14 -0700
committerGitHub <noreply@github.com>2019-03-26 18:26:14 -0700
commit6cbb4c0795099b79f0a7c7d20df4ba1c1ec0ac24 (patch)
tree63c46598415af582b693c05db89fa937a7271b8a /Doc
parent5a3316931c6042df44b3b342df956cd6a77e8dcd (diff)
downloadcpython-git-6cbb4c0795099b79f0a7c7d20df4ba1c1ec0ac24.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')
-rw-r--r--Doc/glossary.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 9e6bf233bb..43abf50475 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -490,6 +490,11 @@ Glossary
:meth:`load_module`. A loader is typically returned by a
:term:`finder`. See :pep:`302` for details.
+ 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.Mapping` or
@@ -698,6 +703,8 @@ Glossary
versions, :meth:`__getslice__` and :meth:`__setslice__`).
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