diff Doc/tutorial/modules.rst @ 70905:51ad2d4390bc 2.7

merge 3.2 - Fix closes Issue12359 - Removing a confusing sentence from the previous change.
author Senthil Kumaran <senthil@uthcode.com>
date Mon, 20 Jun 2011 07:34:48 -0700
parents 6c16a31e0442
children d01208ba482f
line wrap: on
line diff
--- a/Doc/tutorial/modules.rst	Sun Jun 19 17:45:36 2011 -0700
+++ b/Doc/tutorial/modules.rst	Mon Jun 20 07:34:48 2011 -0700
@@ -156,13 +156,13 @@
 .. 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 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`.
+file named :file:`spam.py` in the directory containing the input script 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