[Python-checkins] cpython (2.7): Closes #19178: backport entries for "module" and "package" from 3.x glossary.

[georg.brandl]

http://hg.python.org/cpython/rev/5e1f359d54c4
changeset:   86142:5e1f359d54c4
branch:      2.7
parent:      86132:9524e1468913
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 08 08:05:33 2013 +0200
summary:
  Closes #19178: backport entries for "module" and "package" from 3.x glossary. Patch by Berker Peksag.

files:
  Doc/glossary.rst |  16 ++++++++++++++++
  1 files changed, 16 insertions(+), 0 deletions(-)


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -365,6 +365,10 @@
       fraction.  Integer division can be forced by using the ``//`` operator
       instead of the ``/`` operator.  See also :term:`__future__`.
 
+   importing
+      The process by which Python code in one module is made available to
+      Python code in another module.
+
    importer
       An object that both finds and loads a module; both a
       :term:`finder` and :term:`loader` object.
@@ -509,6 +513,13 @@
       for a member during lookup. See `The Python 2.3 Method Resolution Order
       <http://www.python.org/download/releases/2.3/mro/>`_.
 
+   module
+      An object that serves as an organizational unit of Python code.  Modules
+      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`.
 
@@ -562,6 +573,11 @@
       (methods).  Also the ultimate base class of any :term:`new-style
       class`.
 
+   package
+      A Python :term:`module` which can contain submodules or recursively,
+      subpackages.  Technically, a package is a Python module with an
+      ``__path__`` attribute.
+
    parameter
       A named entity in a :term:`function` (or method) definition that
       specifies an :term:`argument` (or in some cases, arguments) that the

-- 
Repository URL: http://hg.python.org/cpython