[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3
georg.brandl
python-checkins at python.org
Tue Oct 8 08:05:47 CEST 2013
http://hg.python.org/cpython/rev/0f6133498def
changeset: 86144:0f6133498def
parent: 86141:19954e5dbef5
parent: 86143:b6205505e1e4
user: Georg Brandl <georg at python.org>
date: Tue Oct 08 08:06:27 2013 +0200
summary:
merge with 3.3
files:
Doc/glossary.rst | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -529,6 +529,8 @@
have a namespace containing arbitrary Python objects. Modules are loaded
into Python by the process of :term:`importing`.
+ See also :term:`package`.
+
MRO
See :term:`method resolution order`.
@@ -567,6 +569,8 @@
and specifically are not like a :term:`regular package` because they
have no ``__init__.py`` file.
+ See also :term:`module`.
+
nested scope
The ability to refer to a variable in an enclosing definition. For
instance, a function defined inside another function can refer to
@@ -588,10 +592,12 @@
class`.
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
``__path__`` attribute.
+ See also :term:`regular package` and :term:`namespace package`.
+
parameter
A named entity in a :term:`function` (or method) definition that
specifies an :term:`argument` (or in some cases, arguments) that the
@@ -737,6 +743,8 @@
A traditional :term:`package`, such as a directory containing an
``__init__.py`` file.
+ See also :term:`namespace package`.
+
__slots__
A declaration inside a class that saves memory by pre-declaring space for
instance attributes and eliminating instance dictionaries. Though
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list