From: Andre Delfino <adelfino@gmail.com>
Date: Wed, 27 Mar 2019 01:21:27 +0000 (-0300)
Subject: bpo-33832: Add "magic method" glossary entry (GH-7630)
X-Git-Tag: v3.8.0a4~328
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f760610bddd7e8f8ac0914d5d59ef806bc16a73b;p=python

bpo-33832: Add "magic method" glossary entry (GH-7630)
---

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 31cdba2444..5810a6b799 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 0000000000..3d1c63acca
--- /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'.