[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2 - Fix closes Issue12359 - Removing a confusing sentence from the

Mon Jun 20 16:38:24 CEST 2011

http://hg.python.org/cpython/rev/18ebc7809cb2
changeset: 70904:18ebc7809cb2
parent: 70900:7731d2ab4fd4
parent: 70903:a57134dd8688
user: Senthil Kumaran <senthil at uthcode.com>
date: Mon Jun 20 07:33:25 2011 -0700
summary:
 merge from 3.2 - Fix closes Issue12359 - Removing a confusing sentence from the previous change.
files:
 Doc/tutorial/modules.rst | 14 +++++++-------
 1 files changed, 7 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
@@ -160,13 +160,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
-- 
Repository URL: http://hg.python.org/cpython
