merge from 3.5

Issue23675 - A tiny clarification in the MRO glossary term.
This commit is contained in:
Senthil Kumaran 2016-01-09 22:34:40 -08:00
commit 656a8415aa
1 changed files with 2 additions and 1 deletions

View File

@ -626,7 +626,8 @@ Glossary
method resolution order
Method Resolution Order is the order in which base classes are searched
for a member during lookup. See `The Python 2.3 Method Resolution Order
<https://www.python.org/download/releases/2.3/mro/>`_.
<https://www.python.org/download/releases/2.3/mro/>`_ for details of the
algorithm used by the Python interpreter since the 2.3 release.
module
An object that serves as an organizational unit of Python code. Modules