mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge with 3.3

Browse source
This commit is contained in:
Georg Brandl 2013-10-08 08:06:27 +02:00
commit 245c765d0a
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Doc/glossary.rst
View file

@ -529,6 +529,8 @@ Glossary
have a namespace containing arbitrary Python objects. Modules are loaded have a namespace containing arbitrary Python objects. Modules are loaded
into Python by the process of :term:`importing`. into Python by the process of :term:`importing`.
See also :term:`package`.
MRO MRO
See :term:`method resolution order`. See :term:`method resolution order`.
@ -567,6 +569,8 @@ Glossary
and specifically are not like a :term:`regular package` because they and specifically are not like a :term:`regular package` because they
have no ``__init__.py`` file. have no ``__init__.py`` file.
See also :term:`module`.
nested scope nested scope
The ability to refer to a variable in an enclosing definition. For The ability to refer to a variable in an enclosing definition. For
instance, a function defined inside another function can refer to instance, a function defined inside another function can refer to
@ -588,10 +592,12 @@ Glossary
class`. class`.
package package
A Python module which can contain submodules or recursively, A Python :term:`module` which can contain submodules or recursively,
subpackages. Technically, a package is a Python module with an subpackages. Technically, a package is a Python module with an
``__path__`` attribute. ``__path__`` attribute.
See also :term:`regular package` and :term:`namespace package`.
parameter parameter
A named entity in a :term:`function` (or method) definition that A named entity in a :term:`function` (or method) definition that
specifies an :term:`argument` (or in some cases, arguments) that the specifies an :term:`argument` (or in some cases, arguments) that the
@ -737,6 +743,8 @@ Glossary
A traditional :term:`package`, such as a directory containing an A traditional :term:`package`, such as a directory containing an
``__init__.py`` file. ``__init__.py`` file.
See also :term:`namespace package`.
__slots__ __slots__
A declaration inside a class that saves memory by pre-declaring space for A declaration inside a class that saves memory by pre-declaring space for
instance attributes and eliminating instance dictionaries. Though instance attributes and eliminating instance dictionaries. Though