summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Delfino <adelfino@gmail.com>2019-03-27 01:21:27 (GMT)
committerÉric Araujo <merwok@netwok.org>2019-03-27 01:21:27 (GMT)
commitf760610bddd7e8f8ac0914d5d59ef806bc16a73b (patch)
tree654fc2d297a71fa3ab2d3f4126ee4ef06417dc17
parentdfd775a0b1aee51d842b20cdebd97cc52c0b32e7 (diff)
downloadcpython-f760610bddd7e8f8ac0914d5d59ef806bc16a73b.zip
cpython-f760610bddd7e8f8ac0914d5d59ef806bc16a73b.tar.gz
cpython-f760610bddd7e8f8ac0914d5d59ef806bc16a73b.tar.bz2
bpo-33832: Add "magic method" glossary entry (GH-7630)
-rw-r--r--Doc/glossary.rst7
-rw-r--r--Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst1
2 files changed, 8 insertions, 0 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 31cdba2..5810a6b 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -663,6 +663,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
@@ -1004,6 +1009,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
diff --git a/Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst b/Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst
new file mode 100644
index 0000000..3d1c63a
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst
@@ -0,0 +1 @@
+Add glossary entry for 'magic method'.