[Python-checkins] cpython (2.7): Fix issue12359. Minor doc update on import module description.

[senthil.kumaran]

http://hg.python.org/cpython/rev/6c16a31e0442
changeset:   70891:6c16a31e0442
branch:      2.7
parent:      70864:dc78ab3f7bc5
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jun 19 17:45:36 2011 -0700
summary:
  Fix issue12359. Minor doc update on import module description.

files:
  Doc/tutorial/modules.rst |  15 ++++++++-------
  1 files changed, 8 insertions(+), 7 deletions(-)


diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -155,13 +155,14 @@
 
 .. index:: triple: module; search; path
 
-When a module named :mod:`spam` is imported, the interpreter searches for a file
-named :file:`spam.py` in the current directory, and then in the list of
-directories specified by the environment variable :envvar:`PYTHONPATH`.  This
-has the same syntax as the shell variable :envvar:`PATH`, that is, a list of
-directory names.  When :envvar:`PYTHONPATH` is not set, or when the file is not
-found there, the search continues in an installation-dependent default path; on
-Unix, this is usually :file:`.:/usr/local/lib/python`.
+When a module named :mod:`spam` is imported, the interpreter searches for a
+file named :file:`spam.py` in the directory containing the input script (or the
+current directory), and then in the list of directories specified by the
+environment variable :envvar:`PYTHONPATH`.  This has the same syntax as the
+shell variable :envvar:`PATH`, that is, a list of directory names.  When
+:envvar:`PYTHONPATH` is not set, or when the file is not found there, the
+search continues in an installation-dependent default path; on Unix, this is
+usually :file:`.:/usr/local/lib/python`.
 
 Actually, modules are searched in the list of directories given by the variable
 ``sys.path`` which is initialized from the directory containing the input script

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