From: Senthil Kumaran <senthil@uthcode.com>
Date: Mon, 20 Jun 2011 00:41:01 +0000 (-0700)
Subject: merge from 3.2. Issue 12359
X-Git-Tag: v3.3.0a1~2088^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd4c321a3f7664e22ead9ea8ec55c10c10583905;p=python

merge from 3.2. Issue 12359
---

bd4c321a3f7664e22ead9ea8ec55c10c10583905
diff --cc Doc/tutorial/modules.rst
index d4bfbda811,6239c2a681..2451fd5701
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@@ -159,13 -159,14 +159,14 @@@ The Module Search Pat
  
  .. 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
 -thecurrent directory), and then in the list of directories specified by the
++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