diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-03-27 01:26:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 01:26:14 (GMT) |
| commit | 6cbb4c0795099b79f0a7c7d20df4ba1c1ec0ac24 (patch) | |
| tree | 63c46598415af582b693c05db89fa937a7271b8a | |
| parent | 5a3316931c6042df44b3b342df956cd6a77e8dcd (diff) | |
| download | cpython-6cbb4c0795099b79f0a7c7d20df4ba1c1ec0ac24.zip cpython-6cbb4c0795099b79f0a7c7d20df4ba1c1ec0ac24.tar.gz cpython-6cbb4c0795099b79f0a7c7d20df4ba1c1ec0ac24.tar.bz2 | |
bpo-33832: Add "magic method" glossary entry (GH-7630)
(cherry picked from commit f760610bddd7e8f8ac0914d5d59ef806bc16a73b)
Co-authored-by: Andre Delfino <adelfino@gmail.com>
| -rw-r--r-- | Doc/glossary.rst | 7 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 9e6bf23..43abf50 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 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'. |